05/10/2024 - 12h

master
cherif 2024-10-05 12:50:45 +02:00
parent f29dcd46fa
commit 9a73e09180
4 changed files with 2350 additions and 3 deletions

View File

@ -4,8 +4,8 @@
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="sdfsdsdsd">
<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$/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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

File diff suppressed because one or more lines are too long

View File

@ -10980,6 +10980,7 @@ def Invoice_Partner_From_Session_By_Inscription_Id( diction):
partner_invoice_line_data_detail['order_line_inscription_modefinancement'] = str(tmp_inscription_dat['modefinancement'])
partner_invoice_line_data_detail['order_line_formation'] = class_data[0]['internal_url']
partner_invoice_line_data_detail['order_line_prix_unitaire'] = str(prix_session)
partner_invoice_line_data_detail['order_line_qty'] = "1"
partner_invoice_line_data_detail['order_line_montant_hors_taxes'] = str(total_ht)
partner_invoice_line_data_detail['order_line_invoiced_amount'] = str(order_line_montant_hors_taxes_par_apprenant)
partner_invoice_line_data_detail['order_line_comment'] = str(nom_prenom_email_participant)
@ -11561,6 +11562,7 @@ def Invoice_Splited_Partner_From_Session_By_Inscription_Id( diction):
partner_invoice_line_data_detail['order_line_formation'] = class_data[0]['internal_url']
partner_invoice_line_data_detail['order_line_prix_unitaire'] = str(prix_session)
partner_invoice_line_data_detail['order_line_montant_hors_taxes'] = str(total_ht)
partner_invoice_line_data_detail['order_line_qty'] = "1"
partner_invoice_line_data_detail['order_line_invoiced_amount'] = str(split_invoice_part_FLOAT)
partner_invoice_line_data_detail['order_line_comment'] = str(nom_prenom_email_participant)
partner_invoice_line_data_detail['invoice_header_id'] = str(inserted_invoice_id)

View File

@ -361,6 +361,9 @@ def Invoice_Partner_Order(diction):
partner_invoice_line_data_detail['order_line_prix_unitaire'] = str(new_invoice_data_line['order_line_prix_unitaire'])
partner_invoice_line_data_detail['order_line_montant_hors_taxes'] = str(new_invoice_data_line['order_line_montant_hors_taxes'])
partner_invoice_line_data_detail['order_line_invoiced_amount'] = str(new_invoice_data_line['order_line_montant_hors_taxes'])
partner_invoice_line_data_detail['order_line_qty'] = str( new_invoice_data_line['order_line_qty'])
partner_invoice_line_data_detail['order_line_comment'] = ""
partner_invoice_line_data_detail['invoice_header_id'] = str(inserted_invoice_id)
partner_invoice_line_data_detail['invoice_line_type'] = "facture"
@ -3545,7 +3548,7 @@ def Create_Invoice_Avoir_Total(diction):
"""
On a finit de créer l'entete, on va aller créer les lignes
On a finit de créer l'entete, on va aller créer les lignes, partner_invoice_line
"""
for local_invoice_line in MYSY_GV.dbname['partner_invoice_line'].find({'invoice_header_id': str(diction['_id']),
'partner_owner_recid': my_partner['recid'],
@ -3562,7 +3565,7 @@ def Create_Invoice_Avoir_Total(diction):
for tmp in list_champs_a_inverser:
if (tmp in local_credit_note_line.keys() and local_credit_note_line[tmp]):
inversed_tmp = mycommon.tryFloat(str(local_credit_note_line[tmp]).strip()) * (-1)
local_credit_note_line[tmp] = inversed_tmp
local_credit_note_line[tmp] = str(inversed_tmp)
local_credit_note_line['invoice_header_ref_interne_origin'] = local_invoice['invoice_header_ref_interne']
local_credit_note_line['invoice_header_ref_interne'] = credit_notes_reference
@ -3582,6 +3585,45 @@ def Create_Invoice_Avoir_Total(diction):
if (not inserted_id):
mycommon.myprint( " WARNING : Impossible d'inserer la ligne d'avoir pour l'avoir "+str(credit_notes_reference))
"""
On a finit de créer l'entete, on va aller créer les lignes: partner_invoice_line_detail
"""
for local_invoice_line_detail in MYSY_GV.dbname['partner_invoice_line_detail'].find({'invoice_header_id': str(diction['_id']),
'partner_owner_recid': my_partner[
'recid'],
'valide': '1',
'locked': '0'}):
local_credit_note_line_detail = local_invoice_line_detail
list_champs_a_inverser = ['order_line_qty', 'order_line_montant_hors_taxes',
'order_line_invoiced_amount',
]
for tmp in list_champs_a_inverser:
if (tmp in local_credit_note_line_detail.keys() and local_credit_note_line_detail[tmp]):
inversed_tmp = mycommon.tryFloat(str(local_credit_note_line_detail[tmp]).strip()) * (-1)
local_credit_note_line_detail[tmp] = str(inversed_tmp)
local_credit_note_line_detail['invoice_header_ref_interne_origin'] = local_invoice['invoice_header_ref_interne']
local_credit_note_line_detail['invoice_header_ref_interne'] = credit_notes_reference
local_credit_note_line_detail['invoice_header_id'] = str(invoice_header_inserted_id)
local_credit_note_line_detail['invoice_line_type'] = "avoir"
local_credit_note_line_detail['invoice_date'] = invoice_date_time
local_credit_note_line_detail['date_update'] = str(datetime.now())
local_credit_note_line_detail['update_by'] = str(my_partner['_id'])
local_credit_note_line_detail['partner_owner_recid'] = str(my_partner['recid'])
if ("_id" in local_credit_note_line_detail.keys()):
del local_credit_note_line_detail['_id']
inserted_id = MYSY_GV.dbname['partner_invoice_line_detail'].insert_one(local_credit_note_line_detail).inserted_id
if (not inserted_id):
mycommon.myprint(
" WARNING : Impossible d'inserer la ligne d'avoir pour l'avoir " + str(credit_notes_reference))
"""
Apres avoir créer l'avoir, il faut aller voir s'il la facture est liée à une inscription