25/02/26 - 19h30

Signed-off-by: Cherif <cbalde@mysy-training.com>
master_Elyos_FI
Cherif 2026-02-25 21:24:22 +01:00
parent 5818122cf1
commit 33c25f47eb
5 changed files with 4929 additions and 20 deletions

View File

@ -4,18 +4,12 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="22/02/26 - 20h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="24/02/26 - 19h30">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/Inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Job_Cron.py" beforeDir="false" afterPath="$PROJECT_DIR$/Job_Cron.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$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/email_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/email_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lms_chamilo/mysy_lms.py" beforeDir="false" afterPath="$PROJECT_DIR$/lms_chamilo/mysy_lms.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_client.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" />
@ -459,7 +453,7 @@
<option name="project" value="LOCAL" />
<updated>1747251650255</updated>
</task>
<option name="localTasksCounter" value="538" />
<option name="localTasksCounter" value="539" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -501,7 +495,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="13/11/2025 - 22h30" />
<MESSAGE value="15/11/2025 - 22h30" />
<MESSAGE value="16/11/25 - 16h30" />
<MESSAGE value="23/11/25 - 21h30" />
@ -526,6 +519,7 @@
<MESSAGE value="18/02/2026 - 18h" />
<MESSAGE value="21/02/26 - 20h" />
<MESSAGE value="22/02/26 - 20h" />
<option name="LAST_COMMIT_MESSAGE" value="22/02/26 - 20h" />
<MESSAGE value="24/02/26 - 19h30" />
<option name="LAST_COMMIT_MESSAGE" value="24/02/26 - 19h30" />
</component>
</project>

View File

@ -15508,7 +15508,7 @@ avec un nombre de champs limité ET SURTOUT pour qui il reste des paiement à fa
"""
def Get_Insription_From_Session_id_Reduice_Fields_With_Filter_With_To_Paie(diction):
try:
field_list = ['token', 'session_id', 'tab_statut_ids']
field_list = ['token', 'session_id', 'tab_statut_ids', 'client_rattachement_id']
incom_keys = diction.keys()
for val in incom_keys:
if val not in field_list and val.startswith('my_') is False:
@ -15566,6 +15566,9 @@ def Get_Insription_From_Session_id_Reduice_Fields_With_Filter_With_To_Paie(dicti
if( tmp ):
tab_statut_ids_splited.append(tmp)
filt_client_rattachement_id = {}
if ("client_rattachement_id" in diction.keys()):
filt_client_rattachement_id = {'client_rattachement_id': str(diction['client_rattachement_id'])}
## Recuperation de toutes les stagiaire rattaché à cette session
@ -15574,10 +15577,10 @@ def Get_Insription_From_Session_id_Reduice_Fields_With_Filter_With_To_Paie(dicti
myquery['status'] = "1"
myquery['valide'] = "1"
myquery['invoiced'] = {'$ne':'1'}
if ("client_rattachement_id" in diction.keys()):
myquery['client_rattachement_id'] = str(diction['client_rattachement_id'])
if (len(tab_statut_ids_splited) > 0):
myquery['status'] = {'$in': tab_statut_ids_splited}
print(" ## myquerymyquery = ", myquery)
RetObject = []
val_tmp = 0

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,7 @@ Il se base sur les commandes faite à l'aide du fichier "partner_order.py"
"""
import ast
from calendar import monthrange
from os.path import split
import bson
import pymongo
@ -882,8 +883,7 @@ def Invoice_Partner_Quotation(diction):
work_tab = []
if ("order_line_tab_inscrit_id" in new_invoice_data_line.keys()):
for tmp in new_invoice_data_line['order_line_tab_inscrit_id']:
if ("_id" in tmp.keys() and tmp['_id']):
work_tab.append(ObjectId(str(tmp['_id'])))
work_tab.append(ObjectId(str(tmp)))
del new_invoice_data_line['order_line_tab_inscrit_id']
@ -1106,6 +1106,31 @@ def Invoice_Partner_Quotation(diction):
},
{'$set': update_data})
"""
A présent on va aller peupler la table de suivi de document pour qualiopi (Editique)
"""
for inscrit_data in MYSY_GV.dbname['inscription'].find({'partner_owner_recid': str(my_partner['recid']),
'session_id': {'$in': tab_session_3001},
'facture_client_rattachement_id': str(
new_invoice_data_header['order_header_client_id']),
}):
ref_facture = ""
if ("invoice_header_ref_interne" in new_invoice_data_header.keys()):
ref_facture = new_invoice_data_header['invoice_header_ref_interne']
local_status, local_retval = module_editique.Editic_Log_History_Action_From_courrier_template_type_document_ref_interne(
my_partner, "FACTURATION_SESSION", str(inscrit_data['session_id']), 'inscription',
str(inscrit_data['_id']),
"",
"Facture : " + str(ref_facture)
)
if (local_status is False):
mycommon.myprint(" WARNING : Impossible de logguer l'historique l'inscription_id : " + str(val['_id']))
"""
Ajout l'action dans l'historique
"""
@ -6593,7 +6618,7 @@ def Add_Update_Partner_Draft_Invoice_Line(diction):
'invoice_header_id', 'invoice_line_status', 'invoice_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_apprenant',
'tab_inscription_ids', 'order_header_id']
'tab_inscription_ids', 'tab_inscription_ids_from_front', 'order_header_id']
incom_keys = diction.keys()
@ -6767,7 +6792,6 @@ def Add_Update_Partner_Draft_Invoice_Line(diction):
data['order_line_type_apprenant'] = order_line_type_apprenant
order_line_prix_unitaire = ""
if ("order_line_prix_unitaire" in diction.keys()):
order_line_prix_unitaire = diction['order_line_prix_unitaire']
@ -6786,6 +6810,12 @@ def Add_Update_Partner_Draft_Invoice_Line(diction):
for inscrit_data in diction['tab_inscription_ids']:
tab_inscrit_id.append(inscrit_data)
elif ("tab_inscription_ids_from_front" in diction.keys() and diction['tab_inscription_ids_from_front']):
tab_tmp = diction['tab_inscription_ids_from_front'].split(",")
for tmp in tab_tmp:
if( tmp):
tab_inscrit_id.append(tmp)
print(" tab_inscrit_idtab_inscrit_id = ", tab_inscrit_id)
data['tab_inscription_ids'] = tab_inscrit_id
@ -8455,6 +8485,8 @@ def Create_Inscrit_Invoice(diction):
local_diction_ligne['tab_inscription_ids'] = [str(diction['inscription_id'])]
local_statut_line, local_retval = Add_Update_Partner_Draft_Invoice_Line(local_diction_ligne)
if( local_statut_line is False ):
return local_statut_line, local_retval

View File

@ -2406,7 +2406,7 @@ def Add_Update_Partner_Order_Line(diction):
'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_apprenant', 'tab_inscrit_id',
'order_line_tab_inscrit_id', 'order_line_tab_inscrit_id_json']
'order_line_tab_inscrit_id', 'order_line_tab_inscrit_id_json', 'tab_inscription_ids_from_front']
@ -2584,6 +2584,16 @@ def Add_Update_Partner_Order_Line(diction):
tab_inscrit_id.append(inscrit_data)
"""
tab_inscription_ids_from_front ecranse les 2 precedents
"""
if ("tab_inscription_ids_from_front" in diction.keys() and diction['tab_inscription_ids_from_front']):
tab_tmp = diction['tab_inscription_ids_from_front'].split(",")
for tmp in tab_tmp:
if( tmp):
tab_inscrit_id.append(tmp)
data['order_line_tab_inscrit_id'] = tab_inscrit_id
order_line_taux_taxe = ""