From 5998bf48cbc3118426673a876c3347294750a4f8 Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Tue, 20 Jun 2023 15:59:48 +0200 Subject: [PATCH] =?UTF-8?q?d=C3=A9bug=20=20comparaison=20de=20l'adresse=20?= =?UTF-8?q?de=20livraison?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom_popup.py | 26 +++++++++++++------------- dl_version | 2 +- version.py | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/custom_popup.py b/custom_popup.py index eaba6b9..7db1fc8 100644 --- a/custom_popup.py +++ b/custom_popup.py @@ -37,13 +37,13 @@ class Check_addresses_popup(Toplevel): fonts = [] self.x_row = 0 - self.add_compares_element(new_frame=lbf_new,old_frame=lbf_old,label="N° AVS de l'adresse:",str1=item_1['insurance_policy_number'].replace('.',''), str2=item_2.AVS) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Nom:", str1=item_1['lastname'], str2=item_2.lastName) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Prénom:", str1=item_1['firstname'], str2=item_2.firstName) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Date de naissance:", str1=datetime.strptime(item_1['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y"), str2=item_2.birth) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Adresse:", str1=f"{item_1['street'].strip()} {item_1['street_number'].strip()}", str2=item_2.street.strip()) - 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}") + self.add_compares_element(new_frame=lbf_new,old_frame=lbf_old,label="N° AVS de l'adresse:",str1=self.ifNotNull(item_1['insurance_policy_number']).replace('.',''), str2=item_2.AVS) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Nom:", str1=self.ifNotNull(item_1['lastname']), str2=item_2.lastName) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Prénom:", str1=self.ifNotNull(item_1['firstname']), str2=item_2.firstName) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Date de naissance:", str1=datetime.strptime(self.ifNotNull(item_1['birthdate']), "%Y-%m-%d").strftime("%d.%m.%Y"), str2=item_2.birth) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Adresse:", str1=f"{self.ifNotNull(item_1['street']).strip()} {self.ifNotNull(item_1['street_number']).strip()}", str2=item_2.street.strip()) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Complément:", str1=f"{self.ifNotNull(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"{self.ifNotNull(item_1['postal_code'])} {self.ifNotNull(item_1['city'])}", str2=f"{item_2.npa} {item_2.city}") if int(debitor["code"]) < 100: @@ -55,13 +55,13 @@ class Check_addresses_popup(Toplevel): str2=self.ifNotNull(item_2.addr_2),force_color_1=force_color) - str_address_1 += item_1['insurance_policy_number'].replace('.', '') - str_address_1 += item_1['lastname'].strip() - str_address_1 += item_1['firstname'].strip() + str_address_1 += self.ifNotNull(item_1['insurance_policy_number']).replace('.', '') + str_address_1 += self.ifNotNull(item_1['lastname']).strip() + str_address_1 +=self.ifNotNull( item_1['firstname']).strip() str_address_1 += datetime.strptime(item_1['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") - str_address_1 += f"{item_1['street'].strip()} {item_1['street_number'].strip()}" - str_address_1 += f"{item_1['complement'].strip()}" - str_address_1 += f"{item_1['postal_code']} {item_1['city']}" + str_address_1 += f"{self.ifNotNull(item_1['street']).strip()} {self.ifNotNull(item_1['street_number']).strip()}" + str_address_1 += f"{self.ifNotNull(item_1['complement']).strip()}" + str_address_1 += f"{self.ifNotNull(item_1['postal_code'])} {self.ifNotNull(item_1['city'])}" diff --git a/dl_version b/dl_version index 6c33e66..8671060 100644 --- a/dl_version +++ b/dl_version @@ -1 +1 @@ -20230620-1544 \ No newline at end of file +20230620-1559 \ No newline at end of file diff --git a/version.py b/version.py index 28f7557..58a28d5 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -VERSION = "20230620-1544" \ No newline at end of file +VERSION = "20230620-1559" \ No newline at end of file