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

débug comparaison de l'adresse de livraison

Browse Source
This commit is contained in:
Ambulance Clerc
2023-06-20 14:53:20 +02:00
parent c722af1091
commit 4387a1d00b
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
class_invoices.py
View File

@@ -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

2
dl_version
View File

@@ -1 +1 @@
20230620-1423
20230620-1453

18
main.py
View File

@@ -397,22 +397,32 @@ 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"]:
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()

2
version.py
View File

@@ -1 +1 @@
VERSION = "20230620-1423"
VERSION = "20230620-1453"