diff --git a/class_invoices.py b/class_invoices.py
index f230598..d1d1101 100644
--- a/class_invoices.py
+++ b/class_invoices.py
@@ -16,6 +16,49 @@ 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 = "\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.Patient["addr_2"] = concat_str
+    def ifNotNull(self, value, ret=""):
+        if value == None or value == "None":
+            return ret
+        return value.strip()
 
 class cls_Col:
     data = []
diff --git a/custom_popup.py b/custom_popup.py
index ba9b1ee..ad32b64 100644
--- a/custom_popup.py
+++ b/custom_popup.py
@@ -45,44 +45,9 @@ 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,
+        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))
 
 
diff --git a/dl_version b/dl_version
index f4815f7..e1b87c3 100644
--- a/dl_version
+++ b/dl_version
@@ -1 +1 @@
-20230616-1615
\ No newline at end of file
+20230616-1729
\ No newline at end of file
diff --git a/main.py b/main.py
index dc276fd..15d66dd 100644
--- a/main.py
+++ b/main.py
@@ -412,7 +412,8 @@ class ClercAttrib2Biz():
             return False
         if f"{new['postal_code']} {new['city']}" != f"{old.npa} {old.city}":
             return False
-
+        if new["addr_2"] != old.addr_2:
+            return False
         return True
 
 
@@ -644,39 +645,7 @@ class ClercAttrib2Biz():
                         print("NON mise à jour de l'adresse")
 
                     if int(data.Debtor["code"]) > 1:
-                        con = ""
-                        concat_str = ""
-                        if "name" in data.Debtor.keys():
-                            if data.Debtor["name"] is not None:
-                                concat_str += con + data.Debtor["name"]
-                                con = "#chr(13)##chr(10)#"
-                            else:
-                                messagebox.showerror(title="Erreur nom débiteur", message=f"Le nom débiteur de la facture {data.data['id']}  est faux: [{data.Debtor['name']}], merci de le corriger ")
-
-
-                        if data.Debtor["gender"] is not None:
-                            concat_str += con +  "Monsieur" if data.Debtor["gender"] == "Masculin" else con + "Madame"
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["lastname"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["lastname"]) + " " + self.ifNotNull(data.Debtor["firstname"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["complement"] is not None:
-                            concat_str += con + data.Debtor["complement"]
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["street"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["street"]) + " " + self.ifNotNull(data.Debtor["street_number"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["city"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["postal_code"]) + " " + self.ifNotNull(data.Debtor["city"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["country_name"] != "Suisse":
-                            concat_str += con + data.Debtor["country_name"]
-                            con = "#chr(13)##chr(10)#"
-
-
-
-
-                        csv_col.data[42] = concat_str #Adresse de livraison
+                        csv_col.data[42] = data.Patient["addr_2"].replace("\r\n", "#chr(13)##chr(10)#") #Adresse de livraison
                 else:
                     csv_col.data[19] = data.Debtor["code"]  # Code adresse à récupérer dans recherche d'adresse automatisée
                     csv_col.data[22] = data.Debtor["lastname"]
diff --git a/version.py b/version.py
index 56aae1e..547eba8 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-VERSION = "20230616-1615"
\ No newline at end of file
+VERSION = "20230616-1729"
\ No newline at end of file