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 16:16:49 +02:00
parent b19340e149
commit f05a56bc5a
5 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
class_addresses.py
View File

@@ -20,4 +20,5 @@ class cls_addresse:
street = None
street_cpl = None
npa = None
city = None
city = None
addr_2 = None

58
custom_popup.py
View File

@@ -12,7 +12,7 @@ class Check_addresses_popup(Toplevel):
if(item_1["complement"] is None):
item_1["complement"] = ""
self.geometry(f"700x300+{parent.winfo_x() + 25 }+{parent.winfo_y() +25 }")
self.geometry(f"700x450+{parent.winfo_x() + 25 }+{parent.winfo_y() +25 }")
self.resizable(True,True)
self.iconbitmap("./logo_clerc_03X_icon.ico")
self.title(f"Choix de l'adresse à conserver {item_1['fip_number']} / {factureID}. Code débiteur: {debitor['code']}")
@@ -26,6 +26,12 @@ class Check_addresses_popup(Toplevel):
lbf_old = LabelFrame(self, text="Données Winbiz")
lbf_old.grid(row=0, column=1, sticky='NSEW', padx=5, pady=5)
lbf_addr_2_new = LabelFrame(self, text="Données Attrib")
lbf_addr_2_new.grid(row=1, column=0, sticky='WE', padx=5, pady=5)
lbf_addr_2_old = LabelFrame(self, text="Données Winbiz")
lbf_addr_2_old.grid(row=1, column=1, sticky='NSEW', padx=5, pady=5)
str_address_1 = ""
fonts = []
@@ -39,6 +45,46 @@ 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,
str2=self.ifNotNull(item_2.addr_2))
str_address_1 += item_1['insurance_policy_number'].replace('.', '')
str_address_1 += item_1['lastname'].strip()
@@ -63,10 +109,10 @@ class Check_addresses_popup(Toplevel):
str_address_2 += f"{item_2.npa} {item_2.city}"
self.listbox = Listbox(self, height=3, width=35)
self.listbox.grid(row=1,column=0, columnspan= 2, pady=15,padx=15, sticky='NSEW')
self.listbox.grid(row=2,column=0, columnspan= 2, pady=15,padx=15, sticky='NSEW')
self.btn = Button(self, text="Valider", command=self.select)
self.btn.grid(row=2,columnspan=2 , pady=10,padx=10, sticky='NSEW')
self.btn.grid(row=3,columnspan=2 , pady=10,padx=10, sticky='NSEW')
for (idd, info) in ((0, "Winbiz"), (1, "Attrib")) :
self.listbox.insert(END, info)
@@ -88,8 +134,10 @@ class Check_addresses_popup(Toplevel):
self.listbox.selection_set(1)
print(f"adresse différente [{str_address_1}] ({str_address_2})")
def ifNotNull(self, value, ret=""):
if value == None or value == "None":
return ret
return value.strip()
def add_compares_element(self,new_frame, old_frame,str1, str2, label):
label_font = font.Font(weight='bold', size=9)

2
dl_version
View File

@@ -1 +1 @@
20230426-1114
20230616-1615

8
main.py
View File

@@ -140,6 +140,10 @@ class ClercAttrib2Biz():
self.delete_after_parse.set(self.read_config_element("cfg_delete_after_parse", False))
self.export_one_file.set(self.read_config_element("cfg_export_one_file", True))
self.winbiz_folder_path.set(self.read_config_element("winbiz_folder_path", temp_dir))
def add_statistique(self, stat_name, stat_value):
a_stats = None
if "a_stats" in self.config:
a_stats = self.config[""]
def read_config_element(self,name, default):
val = self.config.get(name)
@@ -284,7 +288,8 @@ class ClercAttrib2Biz():
file_addresses_path = os.path.join(temp_dir, f"adresses.dbf")
if os.path.exists(file_addresses_path):
for record in DBF(file_addresses_path):
for record in DBF(file_addresses_path, load=True):
o_addresse = cls_addresse()
o_addresse.AVS = str(record["AD_CODE"])
o_addresse.lastName =str( record["AD_NOM"])
@@ -298,6 +303,7 @@ class ClercAttrib2Biz():
o_addresse.street_cpl =str( record["AD_RUE_1"])
o_addresse.npa =str( record["AD_NPA"])
o_addresse.city = str(record["AD_VILLE"])
o_addresse.addr_2 = str(record["AD_ADR2"])
self.addresses.add_addresse(o_addresse)
logging.warning(f"Chargement du fichier adresses.dbf terminé ! {len(self.addresses.items)} adresses trouvées ")
else:

2
version.py
View File

@@ -1 +1 @@
VERSION = "20230426-1114"
VERSION = "20230616-1615"