sdfsdsdsd
parent
3236117ff7
commit
866336ffe9
|
@ -1,12 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="25/09/2024 - 15h">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="sdfsd">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ela_factures_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/ela_factures_mgt.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/partner_invoice.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_invoice.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/partner_order.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_order.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -76,13 +75,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1680804787304</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00352" summary="dqsdqs">
|
||||
<created>1721069603829</created>
|
||||
<option name="number" value="00352" />
|
||||
<option name="presentableId" value="LOCAL-00352" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1721069603830</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00353" summary="dqsdqss">
|
||||
<created>1721132859678</created>
|
||||
<option name="number" value="00353" />
|
||||
|
@ -419,7 +411,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1727271830872</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="401" />
|
||||
<task id="LOCAL-00401" summary="sdfsd">
|
||||
<created>1727693258457</created>
|
||||
<option name="number" value="00401" />
|
||||
<option name="presentableId" value="LOCAL-00401" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727693258457</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="402" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
|
@ -461,7 +460,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="20/08/2024 - 13h55" />
|
||||
<MESSAGE value="20/08/2024 - 21h55" />
|
||||
<MESSAGE value="21/08/2024 - 13h55" />
|
||||
<MESSAGE value="ss" />
|
||||
|
@ -486,6 +484,7 @@
|
|||
<MESSAGE value="19/09/2024 - 20h" />
|
||||
<MESSAGE value="23/09/2024 - 17h" />
|
||||
<MESSAGE value="25/09/2024 - 15h" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="25/09/2024 - 15h" />
|
||||
<MESSAGE value="sdfsd" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="sdfsd" />
|
||||
</component>
|
||||
</project>
|
1806
Log/log_file.log
1806
Log/log_file.log
File diff suppressed because one or more lines are too long
|
@ -603,6 +603,17 @@ def Get_Given_Partner_Invoice_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_article" in retval.keys()):
|
||||
user['order_line_type_article'] = retval['order_line_type_article']
|
||||
else:
|
||||
user['order_line_type_article'] = ""
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -744,6 +755,12 @@ def Get_Given_Partner_Invoice_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -908,6 +925,16 @@ def Get_Given_Partner_Invoice_Lines_From_Invoice_ref_interne(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_article" in retval.keys()):
|
||||
user['order_line_type_article'] = retval['order_line_type_article']
|
||||
else:
|
||||
user['order_line_type_article'] = ""
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -1045,6 +1072,11 @@ def Get_Given_Partner_Invoice_Lines_From_Invoice_ref_interne(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -1642,6 +1674,16 @@ def Get_Given_Line_Of_Partner_Invoice_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_article" in retval.keys()):
|
||||
user['order_line_type_article'] = retval['order_line_type_article']
|
||||
else:
|
||||
user['order_line_type_article'] = ""
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -1778,6 +1820,12 @@ def Get_Given_Line_Of_Partner_Invoice_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -2057,6 +2105,17 @@ def GerneratePDF_Partner_Invoice(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_article" in retval.keys()):
|
||||
user['order_line_type_article'] = retval['order_line_type_article']
|
||||
else:
|
||||
user['order_line_type_article'] = ""
|
||||
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -2194,6 +2253,12 @@ def GerneratePDF_Partner_Invoice(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -2482,6 +2547,18 @@ def Send_Partner_Invoice_By_Email(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_article" in retval.keys()):
|
||||
user['order_line_type_article'] = retval['order_line_type_article']
|
||||
else:
|
||||
user['order_line_type_article'] = ""
|
||||
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -2619,6 +2696,12 @@ def Send_Partner_Invoice_By_Email(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
|
|
@ -2208,7 +2208,7 @@ def Add_Update_Partner_Order_Line(diction):
|
|||
'order_line_montant_reduction', 'order_line_id', 'order_header_ref_interne',
|
||||
'order_header_id', 'order_line_status', 'order_line_type', 'order_line_comment',
|
||||
'order_line_montant_hors_taxes', 'order_line_tax_amount', 'order_line_montant_toutes_taxes',
|
||||
'order_line_type_article', 'order_line_taux_taxe']
|
||||
'order_line_type_article', 'order_line_taux_taxe', 'order_line_type_apprenant']
|
||||
|
||||
|
||||
|
||||
|
@ -2323,6 +2323,20 @@ def Add_Update_Partner_Order_Line(diction):
|
|||
order_line_type_article = diction['order_line_type_article']
|
||||
data['order_line_type_article'] = order_line_type_article
|
||||
|
||||
order_line_type_apprenant = ""
|
||||
if ("order_line_type_apprenant" in diction.keys()):
|
||||
if diction['order_line_type_apprenant']:
|
||||
order_line_type_apprenant = str(diction['order_line_type_apprenant'])
|
||||
# Verifier que le type d'apprenant est valide
|
||||
is_type_apprenant_valide = MYSY_GV.dbname['type_apprenant'].count_documents({"code":str(order_line_type_apprenant), 'valide':'1', 'locked':'0'})
|
||||
if( is_type_apprenant_valide != 1 ):
|
||||
mycommon.myprint(
|
||||
str(inspect.stack()[0][
|
||||
3]) + " Le type apprenant est invalide.")
|
||||
return False, " Le type apprenant est invalide."
|
||||
|
||||
data['order_line_type_apprenant'] = order_line_type_apprenant
|
||||
|
||||
|
||||
|
||||
order_line_prix_unitaire = ""
|
||||
|
@ -3384,6 +3398,12 @@ def Get_Given_Partner_Order_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -3546,6 +3566,12 @@ def Get_Given_Partner_Order_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -3887,6 +3913,12 @@ def Get_Given_Partner_Order_Lines_From_order_ref_interne(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -4586,6 +4618,11 @@ def Get_Given_Line_Of_Partner_Order_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -4750,6 +4787,11 @@ def Get_Given_Line_Of_Partner_Order_Lines(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -5268,6 +5310,12 @@ def GerneratePDF_Partner_Order(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -5430,6 +5478,12 @@ def GerneratePDF_Partner_Order(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -5754,6 +5808,11 @@ def Gernerate_Stock_PDF_Partner_Order(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -5916,6 +5975,12 @@ def Gernerate_Stock_PDF_Partner_Order(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -6239,6 +6304,12 @@ def Send_Partner_Order_By_Email(tab_files, Folder, diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -6401,6 +6472,11 @@ def Send_Partner_Order_By_Email(tab_files, Folder, diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -8135,6 +8211,12 @@ def Send_Quotation_Remind_Level1(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
@ -8298,6 +8380,12 @@ def Send_Quotation_Remind_Level1(diction):
|
|||
else:
|
||||
user['order_line_montant_reduction'] = "0"
|
||||
|
||||
if ("order_line_type_apprenant" in retval.keys()):
|
||||
user['order_line_type_apprenant'] = retval['order_line_type_apprenant']
|
||||
else:
|
||||
user['order_line_type_apprenant'] = ""
|
||||
|
||||
|
||||
if ("order_line_montant_toutes_taxes" in retval.keys()):
|
||||
user['order_line_montant_toutes_taxes'] = retval['order_line_montant_toutes_taxes']
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue