Compare commits

...

5 Commits

Author SHA1 Message Date
Ambulance Clerc
5ec3b70f71 changement version 2025-06-12 14:05:32 +02:00
Ambulance Clerc
30aebc805a refactor 2025-06-12 14:03:24 +02:00
Ambulance Clerc
edbf48609d change version 2025-06-12 13:55:48 +02:00
Ambulance Clerc
0a27e424cf refactor 2025-06-12 13:55:04 +02:00
Ambulance Clerc
14656c4f5a débug print 2025-06-12 12:20:43 +02:00
4 changed files with 18 additions and 13 deletions

View File

@@ -27,8 +27,8 @@ class cls_Invoice:
# con = "#chr(13)##chr(10)#"
con = "\n"
if debitor["gender"] is not None:
concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
if debitor["gender_name"] is not None:
concat_str += con + "Monsieur" if debitor["gender_name"] == "Masculin" else con + "Madame"
# con = "#chr(13)##chr(10)#"
con = "\n"
if debitor["lastname"] is not None:

View File

@@ -1 +1 @@
20250605-1624
20250612-1404

23
main.py
View File

@@ -32,9 +32,9 @@ from custom_popup import *
from cl_attriblink import cl_AttribLink
src_dir = os.getenv('APPDATA') + "\Attrib2Biz\src"
dest_dir = os.getenv('APPDATA') + "\Attrib2Biz\output"
temp_dir = os.getenv('APPDATA') + '\Attrib2Biz\.temp'
src_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\src'
dest_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\output'
temp_dir = os.getenv('APPDATA') + '\\Attrib2Biz\\.temp'
file_path ="" #os.path.dirname(__file__)
Elements = []
@@ -571,7 +571,7 @@ class ClercAttrib2Biz():
elif "VSL" in temp_code:
b_VSL = True
print(f"Lecture de la facture #{cur_invoice_index} {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="id")} montant total = {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")} <> {facture_total}")
#print(f"Lecture de la facture #{cur_invoice_index} {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="id")} montant total = {self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")} <> {facture_total}")
if float(self.attrib_link.get_value_from_attrib(data=ele,obj="invoice",key="total_price")) != facture_total:
print(f"ERROR NOT SAME PRICE")
total_facture_total += facture_total
@@ -757,12 +757,17 @@ class ClercAttrib2Biz():
csv_col.data[118] = self.attrib_link.km
csv_col.data[135] = self.attrib_link.intervention_base
if self.attrib_link.debtor_code == "100" or self.attrib_link.debtor_code == "101" or self.attrib_link.debtor_code == "158":
csv_col.data[136] = "EBILL" #code présentation de facture
if b_VSL:
csv_col.data[136] = "VSL" #code présentation de facture
if self.attrib_link.debtor_code in ["100", "101", "158"]:
temp_facture_model = "EBILL" # code présentation de facture
elif b_VSL:
temp_facture_model = "VSL" # code présentation de facture
else:
csv_col.data[136] = 3 #code présentation de facture
temp_facture_model = 3
print(f"code = {self.attrib_link.debtor_code}, model: {temp_facture_model}")
csv_col.data[136] = temp_facture_model #code présentation de facture
csv_col.data[146] = 3 #Code méthode de payement définit à 3
csv_col.data[168] = 1 if self.attrib_link.intervention_team == "Planification" else 2
csv_col.data[169] = self.attrib_link.patient_AVS

View File

@@ -1,2 +1,2 @@
VERSION = "20250605-1624"
VERSION = "20250612-1404"