update to 20250605-1624

Ajout de la persistance des otpions

.gitignore

@@ -1 +1,2 @@
 /update.exe
+__pycache__

auto_update.py

@@ -1,5 +1,6 @@
 from version import *
 import urllib.request
+import urllib.error
 import ssl
 import io
 
@@ -22,15 +23,22 @@ class auto_updater:
         ctx.verify_mode = ssl.CERT_NONE
 
         data = urllib.request.urlopen("https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/raw/branch/master/dl_version", context=ctx)
-        self.dl_version = str(data.read()).replace('b', '').replace("'", "")
+        self.dl_version = str(data.read()).replace('b', '').replace("'", "").replace("\n","").replace('n',"")
 
         ssl._create_default_https_context = ssl._create_unverified_context
         if self.dl_version != VERSION:
-            print(f"Version différente trouvée {self.dl_version} téléchargement en cours => {self.temp_dir}update.exe")
+            print(f"Version différente trouvée {self.dl_version} téléchargement en cours => {self.temp_dir}clerc_update.exe")
             try:
-                urllib.request.urlretrieve(url=f"https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/releases/download/{self.clean(self.dl_version)}/Clercattrib2Biz_setup.exe", filename=f"{self.temp_dir}update.exe")
-            except:
-                print("ERREUR de téléchargement mise à jours")
+                url = f"https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/releases/download/{self.clean(self.dl_version)}/Clercattrib2Biz_setup.exe"
+                urllib.request.urlretrieve(url=url, filename=f"{self.temp_dir}clerc_update.exe")
+            except urllib.error.URLError as e:
+                print(f"ERREUR de téléchargement mise à jour : {e.reason} \n {url}")
+                return "ERROR"
+            except urllib.error.HTTPError as e:
+                print(f"ERREUR HTTP lors du téléchargement : {e.code} {e.reason} \n {url}")
+                return "ERROR"
+            except Exception as e:
+                print(f"Erreur inattendue : {e} \n {url}")
                 return "ERROR"
             ret = True
         return ret

cl_attriblink.py

@@ -0,0 +1,222 @@
+
+class cl_AttribLink():
+    def __init__(self):
+        self.invoice_ID = None
+        self.FIP = None
+        self.comments = None
+        self.km = None
+        self.invoice_date = None
+
+
+        self.debtor_code = None
+        self.debtor_name = None        
+        self.debtor_lastname = None
+        self.debtor_firstname = None
+        self.debtor_addr_complement = None
+        self.debtor_street = None
+        self.debtor_street_number = None
+        self.debtor_postal_code = None
+        self.debtor_city = None
+        self.debtor_country = None
+        self.debtor_gender = None
+
+        self.patient_AVS = None
+        self.patient_category = None
+        self.patient_birthdate = None
+        self.patient_lastname = None
+        self.patient_firstname = None
+        self.patient_addr_complement = None
+        self.patient_addr_2 = None
+        self.patient_street = None
+        self.patient_street_number = None
+        self.patient_postal_code = None
+        self.patient_city = None
+        self.patient_country = None
+        self.patient_gender = None
+        self.patient_insurance_name = None
+        
+        self.intervention_type = None
+        self.intervention_base = None
+        self.intervention_team = None
+        self.intervention_start_time = None
+        self.intervention_end_time = None
+
+        #Intervention DEST
+        self.intervention_dest_name = None
+        self.intervention_dest_street = None
+        self.intervention_dest_street_number = None
+        self.intervention_dest_postal_code = None
+        self.intervention_dest_city = None
+
+        #Intervention Site
+        self.intervention_site_name = None
+        self.intervention_site_street = None
+        self.intervention_site_street_number = None
+        self.intervention_site_postal_code = None
+        self.intervention_site_city = None
+        
+        
+        
+        
+
+        self.src_key_invoice = {
+            "id": ["id"],
+            "total_price": ["total_price"],
+            "date": ["date"],
+            "comments": ["comments"],
+            
+        }
+       
+        self.src_key_debtor = {
+            "code": ["code"],
+            "name":  ["name"],
+            "lastname": ["lastname"],
+            "firstname": ["firstname"],
+            "addr_complement": ["complement"],
+            "street": ["street"],
+            "addr_2": ["addr_2"],
+            "street_number": ["street_number"],
+            "postal_code": ["postal_code"],
+            "city": ["city"],
+            "country_name": ["country","country_name"],
+            "gender_name": ["gender","gender_name"],
+        }
+        self.src_key_patient = {
+            "fip": ["fip_number"],
+            "category_name": ["category", "category_name"],
+            "birthdate": ["birthdate"],
+            "AVS": ["insurance_policy_number"],
+            "lastname": ["lastname"],
+            "firstname": ["firstname"],
+            "addr_complement": ["complement"],
+            "street": ["street"],
+            "addr_2": ["addr_2"],
+            "street_number": ["street_number"],
+            "postal_code": ["postal_code"],
+            "city": ["city"],
+            "country_name": ["country","country_name"],
+            "gender_name": ["gender","gender_name"],
+            "insurance_name": ["insurance","insurance_name"],
+        }
+        self.src_key_article = {
+            "price": ["price"],
+            "code": ["code"],
+            "line_1": ["line_1"],
+            "line_2": ["line_2"],
+            "quantity": ["quantity"],
+            "unit_price": ["unit_price"],
+            "unit": ["unit", "unit_name"],
+            "price": ["price"],
+        }
+
+        self.src_key_intervention = {
+            "date": ["date"],
+            "type": ["type"],
+            "kilometers": ["kilometers"],
+            "start_time": ["start_time"],
+            "end_time": ["end_time"],
+            "base_name": ["base", "base_name"],
+            "team_name": ["team", "team_name"],
+            "destination_name": ["destination", "destination_name"],
+            "destination_street": ["destination", "destination_street"],
+            "destination_street_number": ["destination_street_number"],
+            "destination_city": ["destination_city"],
+            "destination_postal_code": ["destination_postal_code"],
+            "site_name": ["site", "site_name"],
+            "site_street": ["site", "site_street"],
+            "site_street_number": ["site_street_number"],
+            "site_city": ["site_city"],
+            "site_postal_code": ["site_postal_code"],
+        }
+
+    def parse_data(self, data):
+        self.invoice_ID = self.get_value_from_attrib(data=data, obj="data", key="id")
+        self.comments = self.get_value_from_attrib(data=data, obj="data", key="comments")
+        self.invoice_date = self.get_value_from_attrib(data=data, obj="data", key="date")
+        
+        
+        self.debtor_code = self.get_value_from_attrib(data=data, obj="debtor", key="code")
+        self.debtor_name = self.get_value_from_attrib(data=data, obj="debtor", key="name")
+        self.debtor_lastname = self.get_value_from_attrib(data=data,obj="debtor",key="lastname")
+        self.debtor_firstname = self.get_value_from_attrib(data=data,obj="debtor",key="firstname")
+        self.debtor_addr_complement = self.get_value_from_attrib(data=data,obj="debtor",key="addr_complement")
+        self.debtor_street = self.get_value_from_attrib(data=data,obj="debtor",key="street")
+        self.debtor_street_number = self.get_value_from_attrib(data=data,obj="debtor",key="street_number")
+        self.debtor_postal_code = self.get_value_from_attrib(data=data,obj="debtor",key="postal_code")
+        self.debtor_city = self.get_value_from_attrib(data=data,obj="debtor",key="city")
+        self.debtor_gender = self.get_value_from_attrib(data=data,obj="debtor",key="gender_name")
+        self.debtor_country = self.get_value_from_attrib(data=data,obj="debtor",key="country_name")
+
+        self.FIP = self.get_value_from_attrib(data=data, obj="patient", key="fip")
+        self.patient_category = self.get_value_from_attrib(data=data, obj="patient", key="category_name")
+        self.patient_birthdate = self.get_value_from_attrib(data=data, obj="patient", key="birthdate")
+        self.patient_lastname = self.get_value_from_attrib(data=data, obj="patient", key="lastname")
+        self.patient_addr_2 = self.get_value_from_attrib(data=data, obj="patient", key="addr_2")
+        self.patient_firstname = self.get_value_from_attrib(data=data, obj="patient", key="firstname")
+        self.patient_addr_complement = self.get_value_from_attrib(data=data, obj="patient", key="addr_complement")
+        self.patient_street = self.get_value_from_attrib(data=data,obj="patient",key="street")
+        self.patient_street_number = self.get_value_from_attrib(data=data,obj="patient",key="street_number")
+        self.patient_postal_code = self.get_value_from_attrib(data=data,obj="patient",key="postal_code")
+        self.patient_city = self.get_value_from_attrib(data=data,obj="patient",key="city")
+        self.patient_gender = self.get_value_from_attrib(data=data,obj="patient",key="gender_name")
+        self.patient_country = self.get_value_from_attrib(data=data,obj="patient",key="country_name")
+        self.patient_insurance_name = self.get_value_from_attrib(data=data,obj="patient",key="insurance_name")
+
+        self.km = self.get_value_from_attrib(data=data, obj="intervention", key="kilometers")
+        self.intervention_start_time = self.get_value_from_attrib(data=data, obj="intervention", key="start_time")
+        self.intervention_end_time = self.get_value_from_attrib(data=data, obj="intervention", key="end_time")
+        self.intervention_base = self.get_value_from_attrib(data=data, obj="intervention", key="base_name")
+        self.intervention_team = self.get_value_from_attrib(data=data, obj="intervention", key="team_name")
+        self.intervention_type = self.get_value_from_attrib(data=data, obj="intervention", key="type")
+
+        self.intervention_dest_name = self.get_value_from_attrib(data=data, obj="intervention", key="destination_name")
+        self.intervention_dest_street = self.get_value_from_attrib(data=data, obj="intervention", key="destination_street")
+        self.intervention_dest_street_number = self.get_value_from_attrib(data=data, obj="intervention", key="destination_street_number")
+        self.intervention_dest_postal_code = self.get_value_from_attrib(data=data, obj="intervention", key="destination_postal_code")
+        self.intervention_dest_city = self.get_value_from_attrib(data=data, obj="intervention", key="destination_city")
+
+        self.intervention_site_name = self.get_value_from_attrib(data=data, obj="intervention", key="site_name")
+        self.intervention_site_street = self.get_value_from_attrib(data=data, obj="intervention", key="site_street")
+        self.intervention_site_street_number = self.get_value_from_attrib(data=data, obj="intervention", key="site_street_number")
+        self.intervention_site_postal_code = self.get_value_from_attrib(data=data, obj="intervention", key="site_postal_code")
+        self.intervention_site_city = self.get_value_from_attrib(data=data, obj="intervention", key="site_city")
+        
+
+
+    def on_error_not_found(self, obj, key):
+        print(f"ERROR AttribLink => obi[{obj}] and key [{key}] not found.")
+    
+    def get_value_from_attrib(self,data,obj, key):
+        #print(f"get value from {obj}=>{key}")
+        ret = False
+        t_obj = None
+        if obj == "data":
+            t_obj = data.data
+            key_src = self.src_key_invoice                                
+        elif obj == "debtor":
+            t_obj = data.Debtor
+            key_src = self.src_key_debtor           
+        elif obj == "patient":
+            t_obj = data.Patient            
+            key_src = self.src_key_patient
+        elif obj == "article":
+            t_obj = data
+            key_src = self.src_key_article
+        elif obj == "invoice":
+            t_obj = data
+            key_src = self.src_key_invoice
+        if obj == "intervention":
+            t_obj = data.Intervention
+            key_src = self.src_key_intervention  
+        
+                
+        for t_key in key_src[key]:
+                if t_key in t_obj:
+                    ret = t_obj[t_key]
+        
+        
+        if ret == False:
+            self.on_error_not_found(obj, key)
+            return None
+        else:
+            return ret

class_addresses.py

@@ -7,6 +7,7 @@ class cls_Addresses:
         self.items.append(items)
     def get_item_by_AVS(self, seek):
         for item in self.items:
+
             if item.AVS == seek:
                 return item
 
@@ -18,5 +19,7 @@ class cls_addresse:
     firstName = None
     birth = None
     street = None
+    street_cpl = None
     npa = None
-    city = None
+    city = None
+    addr_2 = None

class_debitors.py

@@ -17,14 +17,24 @@ class cls_debitors:
             shutil.copy("debitors_src.bin", os.path.join(self.file_path, f"debitors.bin"))
         self.load_debitors()
 
-
-
-    def get_names_by_code(self, code):
+    def print_all_debs(self):
+        for elem in self.items:
+            print(f"Débiteur:{elem.code} {elem.names}")
+    def get_deb_by_code(self, code):
         for deb in self.items:
             if deb.code == int(code):
-                return deb.names
+                return deb
         return None
 
+    def get_names_by_code(self, code):
+        default = []
+        if int(code) < 100:
+            return default
+        for deb in self.items: # items contient l’ensemble des objects détiteur provenant d’un export BDD
+            if deb.code == int(code):
+                return deb.names
+        return default
+
     def is_in_debitor_name(self, code, search_name):
         names = self.get_names_by_code(code)
         if search_name in names:

class_invoices.py

@@ -16,6 +16,57 @@ class cls_Invoice:
         self.data = obj
         self.a_index = {"invoice": [], "intervention": [], "patient": [], "debtor": [], "articles": []}
         self.index_counter = 0
+        self.format_debitor_addr_2()
+    def format_debitor_addr_2(self):
+        debitor = self.Debtor
+        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 = "\n"
+
+        if debitor["gender"] is not None:
+            concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["lastname"] is not None:
+            concat_str += con + self.ifNotNull(debitor["lastname"]) + " " + self.ifNotNull(
+                debitor["firstname"])
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["complement"] is not None:
+            concat_str += con + debitor["complement"]
+            # con = "#chr(13)##chr(10)#"
+            con = "\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 = "\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 = "\n"
+        if debitor["country_name"] != "Suisse":
+            concat_str += con + debitor["country_name"]
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        self.Patient["addr_2"] = concat_str
+        self.Patient["selfish"] = self.is_addr_2_selfish(self.Patient)
+    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 = 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
+    def ifNotNull(self, value, ret=""):
+        if value == None or value == "None":
+            return ret
+        return value.strip()
 
 class cls_Col:
     data = []

counter.py

@@ -0,0 +1,16 @@
+import os
+
+def count_chars_in_folder(folder_path):
+    total_chars = 0
+    for filename in os.listdir(folder_path):
+        filepath = os.path.join(folder_path, filename)
+        if os.path.isfile(filepath):
+            with open(filepath, 'r') as file:
+                content = file.read()
+                total_chars += len(content)
+                print(f"fichier {filepath} = { len(content)}")
+    return total_chars
+
+folder_path = '.'  # mettre le chemin absolu vers le dossier ici
+total_chars = count_chars_in_folder(folder_path)
+print(f"Le nombre total de caractères dans les fichiers du dossier {folder_path} est : {total_chars}")

custom_popup.py

@@ -1,6 +1,7 @@
 from tkinter import *
 from tkinter import font
 from datetime import datetime
+from tkinter import messagebox
 
 class Check_addresses_popup(Toplevel):
     x_row = 0
@@ -8,10 +9,13 @@ class Check_addresses_popup(Toplevel):
     def __init__(self, parent, item_1=None, item_2=None, debitor=None, factureID=""):
         super().__init__(parent)
 
-        self.geometry(f"700x300+{parent.winfo_x() + 25 }+{parent.winfo_y() +25 }")
+        if(item_1["complement"] is None):
+            item_1["complement"] = ""
+
+        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']}")
+        self.title(f"Choix de l'adresse à conserver {item_1['fip_number']} / {factureID}. Code débiteur: {debitor['code']}")
 
         self.columnconfigure(0, weight=1)
         self.columnconfigure(1, weight=1)
@@ -22,25 +26,42 @@ 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="Livraison Attrib")
+        lbf_addr_2_new.grid(row=1, column=0, sticky='WE', padx=5, pady=5)
+
+        lbf_addr_2_old = LabelFrame(self, text="Livraison Winbiz")
+        lbf_addr_2_old.grid(row=1, column=1, sticky='NSEW', padx=5, pady=5)
+
         str_address_1 = ""
 
         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']} {item_1['street_number']}", str2=item_2.street)
-        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}")
 
 
-        str_address_1 += item_1['insurance_policy_number'].replace('.', '')
-        str_address_1 += item_1['lastname'].strip()
-        str_address_1 += item_1['firstname'].strip()
+        if int(debitor["code"]) < 100:
+            if item_1["selfish"]:
+                force_color = "green"
+            else:
+                force_color = None
+            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),force_color_1=force_color)
+
+
+        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']} {item_1['street_number']}"
-        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'])}"
 
 
 
@@ -53,13 +74,14 @@ class Check_addresses_popup(Toplevel):
         str_address_2 += item_2.firstName
         str_address_2 += item_2.birth
         str_address_2 += f"{item_2.street.strip()}"
+        str_address_2 += f"{item_2.street_cpl.strip()}"
         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)
@@ -81,22 +103,28 @@ 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):
+    def add_compares_element(self,new_frame, old_frame,str1, str2, label, force_color_1=None):
         label_font = font.Font(weight='bold', size=9)
 
-        value_color = "black"
+        value_color_1 = "black"
+        value_color_2 = "black"
         con = ""
         if str1 != str2:
-            value_color = "red"
+            value_color_1 = "red"
+            value_color_2 = "red"
             con = "*"
+        if force_color_1 is not None:
+            value_color_1 = force_color_1
 
-        Label(new_frame, text=label, font=label_font).grid(row=self.x_row, column=0, sticky="W")
-        Label(new_frame, text=con + str1 + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
-        Label(old_frame, text=label, font=label_font).grid(row=self.x_row, column=0, sticky="W")
-        Label(old_frame, text=con + str2 + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
+        Label(new_frame, text=str(label), font=label_font).grid(row=self.x_row, column=0, sticky="W")
+        Label(new_frame, text=con + str(str1) + con, fg=value_color_1, anchor="w",  justify=LEFT).grid(row=self.x_row, column=1, sticky="W")
+        Label(old_frame, text=str(label), font=label_font).grid(row=self.x_row, column=0, sticky="W")
+        Label(old_frame, text=con + str(str2) + con, fg=value_color_2, anchor="w", justify=LEFT).grid(row=self.x_row, column=1, sticky="W")
 
         self.x_row += 1
 
@@ -133,16 +161,18 @@ class Check_debitor_popup(Toplevel):
         self.inp_code = StringVar()
         self.inp_code.set(debitor['code'])
 
-        self.geometry(f"850x300+{parent.winfo_x() + 25 }+{parent.winfo_y() +25 }")
+        self.geometry(f"900x275+{parent.winfo_x() + 25 }+{parent.winfo_y() +25 }")
         self.resizable(True,True)
         self.iconbitmap("./logo_clerc_03X_icon.ico")
-        self.title(f"Incohérence sur les débiteurs  {fip}/{factureID}. Code débiteur: {debitor['code']}")
+        self.title(f"Incohérence sur les débiteurs  {fip} / {factureID}. Code débiteur: {debitor['code']}")
 
         self.columnconfigure(0, weight=1)
         self.columnconfigure(1, weight=1)
 
+        Label(self,text="Une incohérence a été trouvée entre le code débiteur saisi dans Attrib et le code débiteur saisi dans Attrib. \nIls ne correspondent pas.Le code débiteur présent dans le champs Code Saisi sera utiliser pour la facture winbiz \nMerci de vérifier et modifier le code débiteur puis cliquer sur Valider.", wraplength= 950, justify=LEFT).grid(row=0,column=0, columnspan=2, sticky="W")
+
         lbf_new = LabelFrame(self, text="Données Attrib")
-        lbf_new.grid(row=0, column=0, sticky='WE', padx=5, pady=5)
+        lbf_new.grid(row=1, column=0, sticky='WE', padx=5, pady=5)
 
         label_font = font.Font(weight='bold', size=9)
         Label(lbf_new, text="Code saisi", font=label_font).grid(row=0, column=0, sticky="W")
@@ -150,15 +180,17 @@ class Check_debitor_popup(Toplevel):
 
 
 
-        Label(lbf_new, text="Débiteur sélectionné", font=label_font).grid(row=1, column=0, sticky="W")
+        Label(lbf_new, text="Débiteur sélectionné dans Attrib", font=label_font).grid(row=1, column=0, sticky="W")
         text_name = Text(lbf_new, fg="red", height=3,width= 30)
         text_name.grid(row=1, column=1, sticky="W")
+        if 'name' not in debitor:
+            debitor['name'] = ""
         text_name.insert(END,debitor['name'])
         text_name.configure(state='disabled')
 
 
-        lbf_old = LabelFrame(self, text="Nom possible")
-        lbf_old.grid(row=0, column=1, sticky='NSEW', padx=5, pady=5)
+        lbf_old = LabelFrame(self, text="Noms possibles")
+        lbf_old.grid(row=1, column=1, sticky='NSEW', padx=5, pady=5)
 
 
 
@@ -171,8 +203,12 @@ class Check_debitor_popup(Toplevel):
         self.listbox.configure(state='disabled')
         self.no_selection_possible = True
 
-        self.btn = Button(lbf_old, text="Ajouter", command=self.add)
-        self.btn.grid(row=2, column=0, columnspan= 2, pady=10, padx=10, sticky='NSEW')
+        menu_bar = Menu(self)
+        menu_param = Menu(menu_bar, tearoff=0)
+        menu_param.add_command(label="Ajouter à la liste", command=self.add)
+        menu_bar.add_cascade(label="Paramètre", menu=menu_param)
+
+        self.config(menu=menu_bar)
 
         self.btn = Button(self, text="Valider", command=self.destroy)
         self.btn.grid(row=2,column=0, columnspan= 2, pady=10,padx=10, sticky='NSEW')
@@ -193,3 +229,60 @@ class Check_debitor_popup(Toplevel):
         print("nouveau code = "+ self.inp_code.get())
         return self.inp_code.get()
 
+
+class Input_popup(Toplevel):
+    x_row = 0
+    no_selection_possible = False
+
+    def __init__(self, parent, text="Veuillez saisir la nouvelle valeur.", default="" ,factureID=None, fip=None, object=None):
+        super().__init__(parent)
+
+        self.object = object
+
+
+        self.inp_value = StringVar()
+        if default is not None:
+            self.inp_value.set(default)
+
+
+        self.geometry(f"650x120+{parent.winfo_x() + 25}+{parent.winfo_y() + 25}")
+        self.resizable(True, True)
+        self.iconbitmap("./logo_clerc_03X_icon.ico")
+        self.title(f"Saisir une valeur  {fip} / {factureID}.")
+
+        self.columnconfigure(0, weight=1)
+        self.columnconfigure(1, weight=1)
+
+        lbf_new = LabelFrame(self, text=text)
+        lbf_new.grid(row=0, column=0, sticky='WE', padx=5, pady=5)
+
+        label_font = font.Font(weight='bold', size=9)
+        Label(lbf_new, text="", font=label_font).grid(row=0, column=0, sticky="W")
+        input_entry = Entry(lbf_new, textvariable=self.inp_value, width=100)
+        input_entry.grid(row=0, column=1, sticky="W", pady=10)
+        input_entry.focus()
+        self.after(0,input_entry.focus)
+
+
+        self.btn = Button(self, text="Valider", command=self.destroy)
+        self.btn.grid(row=2, column=0,  pady=10, padx=10, sticky='NSEW')
+
+    def add(self):
+        self.destroy()
+        if self.object is not None:
+            self.object.add_items(code=self.inp_code.get(), name=self.debitor["name"])
+            self.object.save_debitors()
+
+    def destroy(self):
+        if self.inp_value.get() is None or self.inp_value.get() == "":
+            messagebox.showerror(title="ERREUR", message="Veuillez saisir une valeur !")
+            self.focus()
+        else:
+            super().destroy()
+
+    def show(self):
+        self.deiconify()
+        self.wm_protocol("WM_DELETE_WINDOW", self.destroy)
+        self.wait_window(self)
+        print("nouvelle valeur = " + self.inp_value.get())
+        return self.inp_value.get()

dl_version

@@ -1 +1 @@
-20220614-1653
+20250605-1624

version.py

@@ -1 +1,2 @@
-VERSION = "20220614-1653"
+VERSION = "20250605-1624"
+