diff --git a/class_invoices.py b/class_invoices.py index e7e73b1..568f75a 100644 --- a/class_invoices.py +++ b/class_invoices.py @@ -59,7 +59,7 @@ class cls_Invoice: def is_addr_2_selfish(self, patient): print(patient) temp_addr_2 = str(patient["addr_2"]).replace("Monsieur","").replace("Madame","").replace("\n","").replace(" ","") - str_compare = patient['lastname'].replace('.','') + patient['firstname'].replace('.','') + self.ifNotNull(patient['complement']).strip()+ self.ifNotNull(patient['street']).strip() + self.ifNotNull(patient['street_number']).strip() + self.ifNotNull(patient['postal_code']).strip() +self.ifNotNull(patient['city']).strip() + str_compare = self.ifNotNull(patient['lastname']).replace('.','') + self.ifNotNull(patient['firstname']).replace('.','') + self.ifNotNull(patient['complement']).strip()+ self.ifNotNull(patient['street']).strip() + self.ifNotNull(patient['street_number']).strip() + self.ifNotNull(patient['postal_code']).strip() +self.ifNotNull(patient['city']).strip() str_compare = str_compare.replace(" ","") print(f"is_addr_2_selfish ? {str_compare} <> {temp_addr_2} = {str_compare == temp_addr_2}") return str_compare == temp_addr_2 diff --git a/dl_version b/dl_version index 8f6e7e1..cae1c84 100644 --- a/dl_version +++ b/dl_version @@ -1 +1 @@ -20230620-1423 \ No newline at end of file +20230620-1453 \ No newline at end of file diff --git a/main.py b/main.py index 3701220..0b48084 100644 --- a/main.py +++ b/main.py @@ -397,23 +397,33 @@ class ClercAttrib2Biz(): return ret - def compare_old_and_new_adresses(self, new, old): + def compare_old_and_new_adresses(self, new, old, code): if new['insurance_policy_number'].replace('.','') != old.AVS: + print("compare adresse exit avs") return False if new['lastname'].replace('.','') != old.lastName: + print("compare adresse exit lastname") return False if new['firstname'].replace('.','') != old.firstName: + print("compare adresse exit firstname") return False if datetime.strptime(new['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") != old.birth: + print("compare adresse exit date") return False if f"{new['street'].strip()} {new['street_number'].strip()}" != f"{old.street.strip()}": - print(f"({new['street'].strip()} {new['street_number'].strip()}) != [" + old.street.strip()+"]") + print(f"compare adresse exit ({new['street'].strip()} {new['street_number'].strip()}) != [" + old.street.strip()+"]") return False if f"{new['postal_code']} {new['city']}" != f"{old.npa} {old.city}": + print("compare adresse exit city") return False - if new["addr_2"] != old.addr_2 and not new["selfish"]: - return False + if new["addr_2"] != old.addr_2 and int(code) < 100: + if not new["selfish"]: + print(f"Exit selfish") + return False + elif old.addr_2 == None: + print(f"Exit addr_2 = {old.addr_2}/{new['selfish']}") + return False return True @@ -547,7 +557,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 and not self.compare_old_and_new_adresses(new=data.Patient, old=addresses_exist): + if addresses_exist is not None and not self.compare_old_and_new_adresses(new=data.Patient, old=addresses_exist, code=data.Debtor['code']): 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() diff --git a/version.py b/version.py index f3c66ff..c4b7c0b 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -VERSION = "20230620-1423" \ No newline at end of file +VERSION = "20230620-1453" \ No newline at end of file