Elyos_Formation_Initiale
/
Elyos_FI_Back_Office
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

27/04/26 - 19h 

Signed-off-by: Cherif <cbalde@mysy-training.com>
master_Elyos_FI
Cherif 2026-04-27 19:45:40 +02:00
parent 1ffde079fa
commit 272a958d20
6 changed files with 5085 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/workspace.xml
View File

@ -4,13 +4,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="24/04/26 - 19h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="26/04/26 - 19h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Activite.py" beforeDir="false" afterPath="$PROJECT_DIR$/Activite.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$/invoice_paiement_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/invoice_paiement_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.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$/ressources_materiels.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_materiels.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -454,7 +454,7 @@
<option name="project" value="LOCAL" />
<updated>1747251650255</updated>
</task>
<option name="localTasksCounter" value="567" />
<option name="localTasksCounter" value="568" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -496,7 +496,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="28/02/26 - 22h" />
<MESSAGE value="28/02/26 - 23h" />
<MESSAGE value="01/03/26 - 13h30" />
<MESSAGE value="07/03/26 - 16h" />
@ -521,6 +520,7 @@
<MESSAGE value="21/04/2026 - 11h30" />
<MESSAGE value="21/04/2026 - 21h30" />
<MESSAGE value="24/04/26 - 19h" />
<option name="LAST_COMMIT_MESSAGE" value="24/04/26 - 19h" />
<MESSAGE value="26/04/26 - 19h" />
<option name="LAST_COMMIT_MESSAGE" value="26/04/26 - 19h" />
</component>
</project>

5004
Log/log_file.log
View File

File diff suppressed because one or more lines are too long

14
Session_Formation.py
View File

@ -14560,6 +14560,12 @@ def Invoice_Partner_From_Session_By_Inscription_Id( diction):
partner_invoice_line_data_detail = {}
partner_invoice_line_data_detail['order_line_inscription_id'] = str(tmp_inscription_dat['_id'])
local_tab_inscription_ids = []
local_tab_inscription_ids.append(ObjectId(str(tmp_inscription_dat['_id'])))
partner_invoice_line_data_detail['tab_inscription_ids'] = local_tab_inscription_ids
#print(" JUSTTE AVANNN partner_invoice_line_data_detail = ", partner_invoice_line_data_detail)
partner_invoice_line_data_detail['order_line_inscription_type_apprenant'] = str(tmp_inscription_dat['type_apprenant'])
if( "comment" in tmp_inscription_dat.keys()):
partner_invoice_line_data_detail['order_line_inscription_comment'] = str(tmp_inscription_dat['comment'])
@ -14608,7 +14614,7 @@ def Invoice_Partner_From_Session_By_Inscription_Id( diction):
partner_invoice_line_data_detail['locked'] = "0"
partner_invoice_line_data_detail['partner_owner_recid'] = str(my_partner['recid'])
#print(" UUUUU partner_invoice_line_data_detail = ", partner_invoice_line_data_detail)
inserted_invoice_id = MYSY_GV.dbname['partner_invoice_line_detail'].insert_one(
partner_invoice_line_data_detail).inserted_id
@ -15199,6 +15205,12 @@ def Invoice_Splited_Partner_From_Session_By_Inscription_Id( diction):
}):
partner_invoice_line_data_detail = {}
partner_invoice_line_data_detail['order_line_inscription_id'] = str(tmp_inscription_dat['_id'])
local_tab_inscription_ids = []
local_tab_inscription_ids.append(ObjectId(str(tmp_inscription_dat['_id'])))
partner_invoice_line_data_detail['tab_inscription_ids'] = local_tab_inscription_ids
partner_invoice_line_data_detail['order_line_inscription_type_apprenant'] = str(tmp_inscription_dat['type_apprenant'])
if("comment" in tmp_inscription_dat.keys()):

3
partner_client.py
View File

@ -1580,7 +1580,7 @@ def Get_Partner_List_Partner_Client(diction):
data_cle['valide'] = "1"
data_cle['locked'] = "0"
#print(" ### Get_Partner_List_Partner_Client data_cle = ", data_cle)
print(" ### Get_Partner_List_Partner_Client data_cle = ", data_cle)
RetObject = []
val_tmp = 1
@ -1617,6 +1617,7 @@ def Get_Partner_List_Partner_Client(diction):
val_tmp = val_tmp + 1
RetObject.append(mycommon.JSONEncoder().encode(user))
return True, RetObject

2
partner_invoice.py
View File

@ -2175,7 +2175,7 @@ def Get_List_Partner_Invoice_no_filter(diction):
"""
Recuperation du montant des facture echue (donc en retard)
"""
if (mycommon.CheckisDate(New_retVal['invoice_date_echeance'])):
if ("invoice_date_echeance" in New_retVal.keys() and mycommon.CheckisDate(New_retVal['invoice_date_echeance'])):
mysy_invoice_du_date_ISO_Date = datetime.strptime(str(New_retVal['invoice_date_echeance']),
"%d/%m/%Y")

63
ressources_materiels.py
View File

@ -49,7 +49,8 @@ def Add_Ressource_Materielle(diction):
"""
field_list = ['token', "ref_interne", "nom", "description", "detail", "famille",'marque',
'prix_achat', 'fournisseur', 'qty_stock', 'type', 'site_formation_id', "code_categorie",
'complement_adresse', 'capacite_ideale', 'capacite_max', 'acces_handicape', 'prix_achat_by']
'complement_adresse', 'capacite_ideale', 'capacite_max', 'acces_handicape', 'prix_achat_by',
'adresse', 'code_postal', 'ville', 'pays']
incom_keys = diction.keys()
for val in incom_keys:
@ -236,13 +237,36 @@ def Add_Ressource_Materielle(diction):
adresse = ""
if ("adresse" in diction.keys()):
if diction['adresse']:
adresse = diction['adresse']
data['adresse'] = adresse
code_postal = ""
if ("code_postal" in diction.keys()):
if diction['code_postal']:
code_postal = diction['code_postal']
data['code_postal'] = code_postal
ville = ""
if ("ville" in diction.keys()):
if diction['ville']:
ville = diction['ville']
data['ville'] = ville
pays = ""
if ("pays" in diction.keys()):
if diction['pays']:
pays = diction['pays']
data['pays'] = pays
famille = ""
if ("famille" in diction.keys()):
if diction['famille']:
famille = diction['famille']
data['famille'] = famille
marque = ""
if ("marque" in diction.keys()):
if diction['marque']:
@ -380,7 +404,8 @@ def Update_Ressource_Materielle(diction):
"""
field_list = ['token', "ref_interne", "nom", "description", "detail", "famille",'marque', 'type',
'prix_achat', 'fournisseur', 'qty_stock', '_id', 'site_formation_id', 'code_categorie',
'complement_adresse', 'capacite_ideale', 'capacite_max', 'acces_handicape', 'prix_achat_by']
'complement_adresse', 'capacite_ideale', 'capacite_max', 'acces_handicape', 'prix_achat_by',
'adresse', 'code_postal', 'ville', 'pays']
@ -583,6 +608,19 @@ def Update_Ressource_Materielle(diction):
data_update['detail'] = diction['detail']
if ("adresse" in diction.keys()):
data_update['adresse'] = diction['adresse']
if ("code_postal" in diction.keys()):
data_update['code_postal'] = diction['code_postal']
if ("ville" in diction.keys()):
data_update['ville'] = diction['ville']
if ("pays" in diction.keys()):
data_update['pays'] = diction['pays']
famille = ""
if ("famille" in diction.keys()):
famille = diction['famille']
@ -2271,10 +2309,12 @@ def Get_List_Ressource_Materielle_with_filter(diction):
Si dans la requette on a les champ : 'formation' ou 'session' on utiliser la requete ci-dessous.
Cela veut dire qu'on cherche des ressources qui sont des affectation avec une formation ou une session.
"""
if( "formation" in diction.keys() or "session" in diction.keys() or "employe_email" in diction.keys() ):
for New_retVal in MYSY_GV.dbname['ressource_materielle'].aggregate(new_myquery):
if ('ressource_materielle_affectation_collection' in New_retVal.keys() and len(New_retVal['ressource_materielle_affectation_collection']) > 0):
print(" #### RESULT New_retVal for = ", New_retVal['nom'])
#print(" #### RESULT New_retVal for = ", New_retVal['nom'])
user = {}
user['id'] = str(New_val_tmp)
New_val_tmp = New_val_tmp + 1
@ -2345,7 +2385,6 @@ def Get_List_Ressource_Materielle_with_filter(diction):
user['site_formation_code_site'] = site_formation_code_site
user['affectation'] = []
for local_affectation in New_retVal['ressource_materielle_affectation_collection']:
affectation = {}
@ -2373,6 +2412,20 @@ def Get_List_Ressource_Materielle_with_filter(diction):
user = retval
user['id'] = str(val_tmp)
val_tmp = val_tmp + 1
site_formation_code_site = ""
if ("site_formation_id" in retval.keys() and retval['site_formation_id']):
local_site = MYSY_GV.dbname['site_formation'].find_one(
{'_id': ObjectId(str(retval['site_formation_id'])),
'valide': '1',
'locked': '0',
'partner_owner_recid': str(my_partner['recid'])})
if (local_site and 'code_site' in local_site.keys()):
site_formation_code_site = local_site['code_site']
user['site_formation_code_site'] = site_formation_code_site
RetObject.append(mycommon.JSONEncoder().encode(user))
return True, RetObject