17/07/2024 - 11h30rr

master
cherif 2024-07-18 07:21:18 +02:00
parent a924711dbf
commit 51559012c6
5 changed files with 4623 additions and 23 deletions

View File

@ -1,15 +1,12 @@
<?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="dqsdqss">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="17/07/2024 - 11h30">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/E_Sign_Document.py" beforeDir="false" afterPath="$PROJECT_DIR$/E_Sign_Document.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/Inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/factures_tbd_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/factures_tbd_qries.py" 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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.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" />
<change beforePath="$PROJECT_DIR$/survey_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/survey_mgt.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -79,13 +76,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00305" summary="18/05/2024 - 22h30">
<created>1716064737342</created>
<option name="number" value="00305" />
<option name="presentableId" value="LOCAL-00305" />
<option name="project" value="LOCAL" />
<updated>1716064737343</updated>
</task>
<task id="LOCAL-00306" summary="19/05/2024 - 22h15">
<created>1716149736394</created>
<option name="number" value="00306" />
@ -422,7 +412,14 @@
<option name="project" value="LOCAL" />
<updated>1721132859680</updated>
</task>
<option name="localTasksCounter" value="354" />
<task id="LOCAL-00354" summary="17/07/2024 - 11h30">
<created>1721207839106</created>
<option name="number" value="00354" />
<option name="presentableId" value="LOCAL-00354" />
<option name="project" value="LOCAL" />
<updated>1721207839114</updated>
</task>
<option name="localTasksCounter" value="355" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -464,7 +461,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="06/06/2024 - 20h" />
<MESSAGE value="07/06/2024 - 22h30" />
<MESSAGE value="ssq" />
<MESSAGE value="qqsd" />
@ -489,6 +485,7 @@
<MESSAGE value="14/07/2024 - 22h" />
<MESSAGE value="dqsdqs" />
<MESSAGE value="dqsdqss" />
<option name="LAST_COMMIT_MESSAGE" value="dqsdqss" />
<MESSAGE value="17/07/2024 - 11h30" />
<option name="LAST_COMMIT_MESSAGE" value="17/07/2024 - 11h30" />
</component>
</project>

View File

@ -844,7 +844,7 @@ def Get_Qery_List_Factures_Data_By_Client_V2(diction):
])
#print(" ### Get_Qery_List_Factures_Data ici pipe_qry = ", pipe_qry)
print(" ### Get_Qery_List_Factures_Data_By_Client_V2 ici pipe_qry = ", pipe_qry)
RetObject = []
val_tmp = 0
@ -857,15 +857,35 @@ def Get_Qery_List_Factures_Data_By_Client_V2(diction):
"""
tab_data = []
for retval in MYSY_GV.dbname['partner_invoice_header'].aggregate(pipe_qry):
print(" ### retval ici pipe_qry = ", retval)
val_tmp = val_tmp + 1
user = {}
user['label'] = retval['_id']['Client_nom'][0]
if( retval['_id']['Client_nom'] and retval['_id']['Client_nom'][0] ):
user['label'] = retval['_id']['Client_nom'][0]
else:
user['label'] = "?"
user['value'] = retval['TotalAmount']
user['count'] = retval['count']
user['Client_id'] = retval['_id']['Client_id']
user['Client_nom'] = retval['_id']['Client_nom'][0]
user['Client_raison_sociale'] = retval['_id']['Client_raison_sociale'][0]
if (retval['_id']['Client_id']):
user['Client_id'] = retval['_id']['Client_id']
else:
user['Client_id'] = "?"
if (retval['_id']['Client_nom'] and retval['_id']['Client_nom'][0]):
user['Client_nom'] = retval['_id']['Client_nom'][0]
else:
user['Client_nom'] = "?"
if (retval['_id']['Client_raison_sociale'] and retval['_id']['Client_raison_sociale'][0]):
user['Client_raison_sociale'] = retval['_id']['Client_raison_sociale'][0]
else:
user['Client_raison_sociale'] = "?"
tab_data.append(user)

File diff suppressed because one or more lines are too long

View File

@ -3072,7 +3072,7 @@ def Compute_Invoice_Order_Data(diction):
global_order_amount_ht_before_header_reduction = line_sum_invoice_line_montant_hors_taxes_after_reduction
global_order_amount_ht_after_header_reduction = line_sum_invoice_line_montant_hors_taxes_after_reduction
global_order_amount_ttc = global_order_amount_ht_after_header_reduction * 1.2
global_order_amount_ttc = global_order_amount_ht_after_header_reduction + line_sum_invoice_line_tax_amount
"""print(" ###### header_reduction_type_value_total_amount = ", header_reduction_type_value_total_amount)
print(" ###### global_order_amount_ht_before_header_reduction = ", line_sum_order_line_montant_hors_taxes_after_reduction)

View File

@ -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_type_article', 'order_line_taux_taxe']
@ -2333,6 +2333,14 @@ def Add_Update_Partner_Order_Line(diction):
order_line_tax = diction['order_line_tax']
data['order_line_tax'] = order_line_tax
order_line_taux_taxe = ""
if ("order_line_taux_taxe" in diction.keys()):
if diction['order_line_taux_taxe']:
order_line_taux_taxe = diction['order_line_taux_taxe']
data['order_line_taux_taxe'] = order_line_taux_taxe
order_line_tax_amount = ""
if ("order_line_tax_amount" in diction.keys()):
if diction['order_line_tax_amount']:
@ -3404,6 +3412,12 @@ def Get_Given_Partner_Order_Lines(diction):
user['order_line_montant_hors_taxes'] = "0"
if ("order_line_taux_taxe" in retval.keys()):
user['order_line_taux_taxe'] = retval['order_line_taux_taxe']
else:
user['order_line_taux_taxe'] = "20"
user['date_update'] = retval['date_update']
user['partner_owner_recid'] = retval['partner_owner_recid']
user['order_line_type'] = retval['order_line_type']
@ -3540,6 +3554,12 @@ def Get_Given_Partner_Order_Lines(diction):
else:
user['order_line_tax_amount'] = "0"
if ("order_line_taux_taxe" in retval.keys()):
user['order_line_taux_taxe'] = retval['order_line_taux_taxe']
else:
user['order_line_taux_taxe'] = "20"
if ("order_line_type_reduction" in retval.keys()):
user['order_line_type_reduction'] = retval['order_line_type_reduction']
else:
@ -4527,6 +4547,12 @@ def Get_Given_Line_Of_Partner_Order_Lines(diction):
else:
user['order_line_tax_amount'] = "0"
if ("order_line_taux_taxe" in retval.keys()):
user['order_line_taux_taxe'] = retval['order_line_taux_taxe']
else:
user['order_line_taux_taxe'] = "20"
if ("order_line_type_reduction" in retval.keys()):
user['order_line_type_reduction'] = retval['order_line_type_reduction']
else:
@ -4679,6 +4705,12 @@ def Get_Given_Line_Of_Partner_Order_Lines(diction):
else:
user['order_line_tax'] = ""
if ("order_line_taux_taxe" in retval.keys()):
user['order_line_taux_taxe'] = retval['order_line_taux_taxe']
else:
user['order_line_taux_taxe'] = "20"
if ("order_line_tax_amount" in retval.keys()):
user['order_line_tax_amount'] = retval['order_line_tax_amount']
else:
@ -4867,6 +4899,8 @@ def Compute_Order_Header(diction):
nb_line = nb_line + 1
line_sum_order_line_montant_hors_taxes_after_reduction = line_sum_order_line_montant_hors_taxes_before_reduction - line_sum_order_line_montant_reduction
print(" ###### line_sum_order_line_tax_amount = ", line_sum_order_line_tax_amount)
"""
print(" ###### Apres compute des lignes : NB_LINE = ", nb_line)
print(" ###### line_sum_order_line_montant_reduction = ", line_sum_order_line_montant_reduction)
@ -4925,7 +4959,7 @@ def Compute_Order_Header(diction):
global_order_amount_ht_after_header_reduction = line_sum_order_line_montant_hors_taxes_after_reduction
global_order_amount_ttc = global_order_amount_ht_after_header_reduction * 1.2
global_order_amount_ttc = global_order_amount_ht_after_header_reduction + line_sum_order_line_tax_amount
"""print(" ###### header_reduction_type_value_total_amount = ", header_reduction_type_value_total_amount)
print(" ###### global_order_amount_ht_before_header_reduction = ", line_sum_order_line_montant_hors_taxes_after_reduction)