Débug version

Prise en charge des EBILL pour code 101

dl_version

@@ -1 +1 @@
-20220630-1013
+20220813-0700

main.py

@@ -353,6 +353,23 @@ class ClercAttrib2Biz():
 
         return ret
 
+    def compare_old_and_new_adresses(self, new, old):
+
+        if new['insurance_policy_number'].replace('.','') != old.AVS:
+            return False
+        if new['lastname'].replace('.','') != old.lastName:
+            return False
+        if new['firstname'].replace('.','') != old.firstName:
+            return False
+        if datetime.strptime(new['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") != old.birth:
+            return False
+        if f"{new['street']} {new['street_number']}" != old.street:
+            return False
+        if f"{new['postal_code']} {new['city']}" != f"{old.npa} {old.city}":
+            return False
+
+        return True
+
 
     def parseFile(self, data, filename):
         self.index_counter += 1
@@ -436,7 +453,7 @@ class ClercAttrib2Biz():
 
             if self.check_addresses.get():
                 addresses_exist = self.addresses.get_item_by_AVS(data.Patient['insurance_policy_number'].replace(".", ""))
-                if addresses_exist is not None:
+                if addresses_exist is not None and not self.compare_old_and_new_adresses(new=data.Patient, old=addresses_exist):
                     popup = Check_addresses_popup(self.fenetre, item_1=data.Patient, item_2=addresses_exist, debitor=data.Debtor, factureID=data.data['id'])
                     b_address_update = popup.show()
                     print(f"Result Popup: {b_address_update}")
@@ -478,6 +495,7 @@ class ClercAttrib2Biz():
                 csv_col.data[139] = "COND-30"  # Conditions de payement à 30, COND-30 selon config dans winbiz
 
 
+
                 if "without_transportation" in data.Intervention.keys() and data.Intervention["without_transportation"] == True:
                     csv_col.data[15] = "Sans transport"
                     print(f"->NO DEST** {data.data['id']}")
@@ -546,15 +564,19 @@ class ClercAttrib2Biz():
                         if data.Debtor["lastname"] is not None:
                             concat_str += con + self.ifNotNull(data.Debtor["lastname"]) + " " + self.ifNotNull(data.Debtor["firstname"])
                             con = "#chr(13)##chr(10)#"
-                        if data.Debtor["street"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["street"]) + " " + self.ifNotNull(data.Debtor["street_number"])
-                            con = "#chr(13)##chr(10)#"
                         if data.Debtor["complement"] is not None:
                             concat_str += con + data.Debtor["complement"]
                             con = "#chr(13)##chr(10)#"
+                        if data.Debtor["street"] is not None:
+                            concat_str += con + self.ifNotNull(data.Debtor["street"]) + " " + self.ifNotNull(data.Debtor["street_number"])
+                            con = "#chr(13)##chr(10)#"
                         if data.Debtor["city"] is not None:
                             concat_str += con + self.ifNotNull(data.Debtor["postal_code"]) + " " + self.ifNotNull(data.Debtor["city"])
                             con = "#chr(13)##chr(10)#"
+                        if data.Debtor["country_name"] != "Suisse":
+                            concat_str += con + data.Debtor["country_name"]
+                            con = "#chr(13)##chr(10)#"
+
 
 
 
@@ -632,15 +654,18 @@ class ClercAttrib2Biz():
                 csv_col.data[72] = "BU - 73 - aff"
                 csv_col.data[73] = 0
 
-                csv_col.data[115] = self.ifNotNull(data.Patient["lastname"]) + " " + self.ifNotNull(data.Patient["firstname"])
-                csv_col.data[108] = data.Patient["complement"]
+                #Objet facture
+                csv_col.data[108] = self.ifNotNull(data.Patient["lastname"]) + " " + self.ifNotNull(data.Patient["firstname"])
+                csv_col.data[115] = data.Patient["complement"]
                 csv_col.data[109] = datetime.strptime(data.Patient["birthdate"], "%Y-%m-%d").strftime("%d.%m.%Y") if data.Patient["birthdate"] is not None else ""
                 if data.Patient["insurance_policy_number"] is not None and '-' not in data.Patient["insurance_policy_number"]:
                     csv_col.data[109] += ", " + data.Patient["insurance_policy_number"]
 
                 csv_col.data[110] = data.Patient["insurance_name"]
-                csv_col.data[111] = datetime.strptime(data.Intervention["start_time"], "%Y-%m-%dT%H:%M:%S%z").strftime(
-                    "%d.%m.%Y")  # Date PEC
+                date_PEC = datetime.strptime(data.Intervention["start_time"], "%Y-%m-%dT%H:%M:%S%z").strftime(
+                    "%d.%m.%Y")
+                csv_col.data[51] = date_PEC # Date de ligne articles
+                csv_col.data[111] =date_PEC  # Date PEC
                 csv_col.data[111] += " - " + datetime.strptime(data.Intervention["start_time"], "%Y-%m-%dT%H:%M:%S%z").strftime(
                     "%H:%M")  # Heure START PEC
 
@@ -660,8 +685,8 @@ class ClercAttrib2Biz():
                 csv_col.data[116] = self.ifNotNull(data.Patient["category"]) + " - " + self.ifNotNull(data.Intervention["type"])
                 csv_col.data[118] = data.Intervention["kilometers"]
                 csv_col.data[135] = data.Intervention["base_name"]
-                csv_col.data[136] = 2 if data.Intervention["base_name"] == "Uvrier" else 3
-                csv_col.data[146] = csv_col.data[136]
+                csv_col.data[136] = 3 if data.Debtor["code"] != "101" else "EBILL" #code présentation de facture
+                csv_col.data[146] = 3  #Code méthode de payement définit à 3
                 csv_col.data[168] = 1 if data.Intervention["team_name"] == "Planification" else 2
                 csv_col.data[169] =  data.Patient['insurance_policy_number']
 
@@ -681,7 +706,7 @@ class ClercAttrib2Biz():
             self.a_index["global"].append(key)
         obj.data.append(data)
 
-    def convertFile(self, data, filename):
+    def convertFile(self, data, filename): #à utiliser pour un export avec fichier excel de Thomas
         self.count_facture += len(data["invoices"])
         self.a_listings["to_check"] = []
 

version.py

@@ -1 +1 @@
-VERSION = "20220630-1013"
+VERSION = "20220813-0700"