changement version

cl_attriblink.py

@@ -1,4 +1,3 @@
-
 class cl_AttribLink():
     def __init__(self):
         self.invoice_ID = None
@@ -148,6 +147,7 @@ class cl_AttribLink():
         self.debtor_country = self.get_value_from_attrib(data=data,obj="debtor",key="country_name")
 
         self.FIP = self.get_value_from_attrib(data=data, obj="patient", key="fip")
+        self.patient_AVS = self.get_value_from_attrib(data=data, obj="patient", key="AVS")
         self.patient_category = self.get_value_from_attrib(data=data, obj="patient", key="category_name")
         self.patient_birthdate = self.get_value_from_attrib(data=data, obj="patient", key="birthdate")
         self.patient_lastname = self.get_value_from_attrib(data=data, obj="patient", key="lastname")

class_invoices.py

@@ -27,8 +27,8 @@ class cls_Invoice:
                 # con = "#chr(13)##chr(10)#"
                 con = "\n"
 
-        if debitor["gender"] is not None:
+        if debitor["gender_name"] is not None:
-            concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
+            concat_str += con + "Monsieur" if debitor["gender_name"] == "Masculin" else con + "Madame"
             # con = "#chr(13)##chr(10)#"
             con = "\n"
         if debitor["lastname"] is not None:

dl_version

@@ -1 +1 @@
-20241109-1726
+20250612-1404

main.py

@@ -32,9 +32,9 @@ from custom_popup import  *
 from cl_attriblink import cl_AttribLink
 
 
-src_dir = os.getenv('APPDATA') + "\Attrib2Biz\src"
+src_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\src'
-dest_dir = os.getenv('APPDATA') + "\Attrib2Biz\output"
+dest_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\output'
-temp_dir = os.getenv('APPDATA') + '\Attrib2Biz\.temp'
+temp_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\.temp'
 file_path ="" #os.path.dirname(__file__)
 
 Elements = []
@@ -571,7 +571,7 @@ class ClercAttrib2Biz():
                     elif "VSL" in temp_code:
                         b_VSL = True
 
-            print(f"Lecture de la facture #{cur_invoice_index} {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="id")}  montant total = {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")} <> {facture_total}")
+            #print(f"Lecture de la facture #{cur_invoice_index} {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="id")}  montant total = {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")} <> {facture_total}")
             if float(self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")) != facture_total:
                 print(f"ERROR NOT SAME PRICE")
             total_facture_total += facture_total
@@ -757,12 +757,17 @@ class ClercAttrib2Biz():
                 csv_col.data[118] = self.attrib_link.km
                 csv_col.data[135] = self.attrib_link.intervention_base
                 
-                if self.attrib_link.debtor_code == "100" or self.attrib_link.debtor_code == "101" or self.attrib_link.debtor_code == "158":
+                
-                    csv_col.data[136] = "EBILL" #code présentation de facture
+                if self.attrib_link.debtor_code in ["100", "101", "158"]:
-                if b_VSL:
+                    temp_facture_model = "EBILL"  # code présentation de facture
-                    csv_col.data[136] = "VSL" #code présentation de facture
+                elif b_VSL:
+                    temp_facture_model = "VSL"  # code présentation de facture
                 else:
-                    csv_col.data[136] = 3  #code présentation de facture
+                    temp_facture_model = 3
+
+                    
+                print(f"code = {self.attrib_link.debtor_code}, model: {temp_facture_model}")
+                csv_col.data[136] = temp_facture_model  #code présentation de facture
                 csv_col.data[146] = 3  #Code méthode de payement définit à 3
                 csv_col.data[168] = 1 if self.attrib_link.intervention_team == "Planification" else 2
                 csv_col.data[169] =  self.attrib_link.patient_AVS

version.py

@@ -1,2 +1,2 @@
-VERSION = "20241109-1726"
+VERSION = "20250612-1404"