CLERC/AttribWinbiz
5
0
Fork 0
Code Issues Pull Requests Releases 52 Wiki Activity

Ajout de la comparaison de l'adresse de livraison

Browse Source
This commit is contained in:
Ambulance Clerc
2023-06-16 17:29:35 +02:00
parent e4c075f6ef
commit 1146ff01c7
5 changed files with 49 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
custom_popup.py
View File

@@ -45,44 +45,9 @@ class Check_addresses_popup(Toplevel):
self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Complément:", str1=f"{item_1['complement'].strip()}", str2=item_2.street_cpl.strip())
self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="NPA/Localité:", str1=f"{item_1['postal_code']} {item_1['city']}", str2=f"{item_2.npa} {item_2.city}")
con = ""
concat_str = ""
if "name" in debitor.keys():
if debitor["name"] is not None:
concat_str += con + debitor["name"]
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["gender"] is not None:
concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["lastname"] is not None:
concat_str += con + self.ifNotNull(debitor["lastname"]) + " " + self.ifNotNull(
debitor["firstname"])
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["complement"] is not None:
concat_str += con + debitor["complement"]
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["street"] is not None:
concat_str += con + self.ifNotNull(debitor["street"]) + " " + self.ifNotNull(
debitor["street_number"])
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["city"] is not None:
concat_str += con + self.ifNotNull(debitor["postal_code"]) + " " + self.ifNotNull(
debitor["city"])
#con = "#chr(13)##chr(10)#"
con = "\r\n"
if debitor["country_name"] != "Suisse":
concat_str += con + debitor["country_name"]
#con = "#chr(13)##chr(10)#"
con = "\r\n"
self.add_compares_element(new_frame=lbf_addr_2_new, old_frame=lbf_addr_2_old, label="Adresse livraison:", str1=concat_str,
self.add_compares_element(new_frame=lbf_addr_2_new, old_frame=lbf_addr_2_old, label="Adresse livraison:", str1=item_1["addr_2"],
str2=self.ifNotNull(item_2.addr_2))