06/06/2024 - 20h

master
cherif 2024-06-06 20:18:07 +02:00
parent d45f024d35
commit e9f6d7b351
5 changed files with 974 additions and 26 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="05/06/2024 - 23h"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="06/06/2024 - 12h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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$/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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_editique.py" beforeDir="false" afterPath="$PROJECT_DIR$/module_editique.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -76,13 +76,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00276" summary="23/04/2024 - 14h06">
<created>1713874032440</created>
<option name="number" value="00276" />
<option name="presentableId" value="LOCAL-00276" />
<option name="project" value="LOCAL" />
<updated>1713874032440</updated>
</task>
<task id="LOCAL-00277" summary="25/04/2024 - 19h"> <task id="LOCAL-00277" summary="25/04/2024 - 19h">
<created>1714064812225</created> <created>1714064812225</created>
<option name="number" value="00277" /> <option name="number" value="00277" />
@ -419,7 +412,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1717621132735</updated> <updated>1717621132735</updated>
</task> </task>
<option name="localTasksCounter" value="325" /> <task id="LOCAL-00325" summary="06/06/2024 - 12h">
<created>1717668732175</created>
<option name="number" value="00325" />
<option name="presentableId" value="LOCAL-00325" />
<option name="project" value="LOCAL" />
<updated>1717668732176</updated>
</task>
<option name="localTasksCounter" value="326" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -461,7 +461,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="ddsdfsd" />
<MESSAGE value="12/05/2024 - 21h30" /> <MESSAGE value="12/05/2024 - 21h30" />
<MESSAGE value="13/05/2024 - 18h30" /> <MESSAGE value="13/05/2024 - 18h30" />
<MESSAGE value="14/05/2024 - 21h30" /> <MESSAGE value="14/05/2024 - 21h30" />
@ -486,6 +485,7 @@
<MESSAGE value="qsdsq" /> <MESSAGE value="qsdsq" />
<MESSAGE value="qsdsqsqdsq" /> <MESSAGE value="qsdsqsqdsq" />
<MESSAGE value="05/06/2024 - 23h" /> <MESSAGE value="05/06/2024 - 23h" />
<option name="LAST_COMMIT_MESSAGE" value="05/06/2024 - 23h" /> <MESSAGE value="06/06/2024 - 12h" />
<option name="LAST_COMMIT_MESSAGE" value="06/06/2024 - 12h" />
</component> </component>
</project> </project>

File diff suppressed because one or more lines are too long

View File

@ -10027,6 +10027,7 @@ def Invoice_Partner_From_Session_By_Inscription_Id( diction):
mycommon.myprint(" Facture : Impossible de créer l'entête de la facture ") mycommon.myprint(" Facture : Impossible de créer l'entête de la facture ")
return False, " Facture : Impossible de créer l'entête de la facture ", False return False, " Facture : Impossible de créer l'entête de la facture ", False
new_invoice_id = inserted_invoice_id
""" """
Création des lignes de facture. Création des lignes de facture.
@ -10095,13 +10096,13 @@ def Invoice_Partner_From_Session_By_Inscription_Id( diction):
""" """
e_Invoice_Diction = {} e_Invoice_Diction = {}
e_Invoice_Diction['token'] = diction['token'] e_Invoice_Diction['token'] = diction['token']
e_Invoice_Diction['invoice_id'] = str(inserted_invoice_id) e_Invoice_Diction['invoice_id'] = str(new_invoice_id)
print(" ### e_Invoice_Diction= ", e_Invoice_Diction )
local_E_Invoice_status, local_E_Invoice_retval = Invoice_Create_Secure_E_Document(e_Invoice_Diction) local_E_Invoice_status, local_E_Invoice_retval = Invoice_Create_Secure_E_Document(e_Invoice_Diction)
if( local_E_Invoice_status is False ): if( local_E_Invoice_status is False ):
return True, "WARNING : L'email a été correctement envoyé ", str( return True, "WARNING : L'email a été correctement envoyé ", str(
partner_invoice_header_data['invoice_header_ref_interne']+"; mais impossible de créer la e-Facture Sécurisée.") partner_invoice_header_data['invoice_header_ref_interne']+"; mais impossible de créer la e-Facture Sécurisée (2).")
return True, "L'email a été correctement envoyé ", str(partner_invoice_header_data['invoice_header_ref_interne']) return True, "L'email a été correctement envoyé ", str(partner_invoice_header_data['invoice_header_ref_interne'])

View File

@ -743,12 +743,16 @@ def Get_List_Partner_Apprenant(diction):
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
# Recuperer les données du client # Recuperer les données du client
client_nom = ""
if ("client_rattachement_id" in val.keys() and val['client_rattachement_id']): if ("client_rattachement_id" in val.keys() and val['client_rattachement_id']):
client_data = MYSY_GV.dbname['partner_client'].find_one( client_data = MYSY_GV.dbname['partner_client'].find_one(
{'_id': ObjectId(str(val['client_rattachement_id'])), {'_id': ObjectId(str(val['client_rattachement_id'])),
'valide': '1', 'valide': '1',
'locked': '0'}) 'locked': '0'})
user['client_nom'] = client_data['nom'] if( client_data and "nom" in client_data.keys() ):
client_nom = client_data['nom']
user['client_nom'] = client_nom
RetObject.append(mycommon.JSONEncoder().encode(user)) RetObject.append(mycommon.JSONEncoder().encode(user))
@ -1615,8 +1619,12 @@ def Add_Apprenant_mass(file=None, Folder=None, diction=None):
mydata['prenom'] = str(df['prenom'].values[n]) mydata['prenom'] = str(df['prenom'].values[n])
mydata['nom'] = str(df['nom'].values[n]) mydata['nom'] = str(df['nom'].values[n])
mydata['email'] = str(df['email'].values[n]) mydata['email'] = str(df['email'].values[n])
mydata['civilite'] = str(df['civilite'].values[n])
civilite = ""
if ("civilite" in df.keys()):
if (str(df['civilite'].values[n])):
civilite = str(df['civilite'].values[n])
mydata['civilite'] = civilite
telephone = "" telephone = ""
if ("telephone" in df.keys()): if ("telephone" in df.keys()):
@ -1864,7 +1872,7 @@ def Controle_Add_Apprenant_mass(saved_file=None, Folder=None, diction=None):
mydata['prenom'] = str(df['prenom'].values[n]) mydata['prenom'] = str(df['prenom'].values[n])
mydata['nom'] = str(df['nom'].values[n]) mydata['nom'] = str(df['nom'].values[n])
mydata['email'] = str(df['email'].values[n]) mydata['email'] = str(df['email'].values[n])
mydata['civilite'] = str(df['civilite'].values[n])
if (len(str(mydata['nom']).strip()) < 2): if (len(str(mydata['nom']).strip()) < 2):
mycommon.myprint( mycommon.myprint(
@ -1880,12 +1888,15 @@ def Controle_Add_Apprenant_mass(saved_file=None, Folder=None, diction=None):
return False, " Le champ 'prenom' de la ligne " + str( return False, " Le champ 'prenom' de la ligne " + str(
n + 2) + " doit faire plus de deux caractères. " n + 2) + " doit faire plus de deux caractères. "
if ( str(mydata['civilite']).lower() not in MYSY_GV.CIVILITE ): civilite = ""
mycommon.myprint( if ("civilite" in df.keys() and df['civilite'].values[n]):
str(inspect.stack()[0][3]) + " Le champ 'civilite' de la ligne " + str( civilite = str(df['civilite'].values[n])
n + 2) + " est invalide ") if ( str(mydata['civilite']).lower() not in MYSY_GV.CIVILITE ):
return False, " Le champ 'civilite' de la ligne " + str( mycommon.myprint(
n + 2) + " est invalide. " str(inspect.stack()[0][3]) + " Le champ 'civilite' de la ligne " + str(
n + 2) + " est invalide ")
return False, " Le champ 'civilite' de la ligne " + str(
n + 2) + " est invalide. "

View File

@ -377,7 +377,7 @@ def Invoice_Partner_Order(diction):
local_E_Invoice_status, local_E_Invoice_retval = Session_Formation.Invoice_Create_Secure_E_Document(e_Invoice_Diction) local_E_Invoice_status, local_E_Invoice_retval = Session_Formation.Invoice_Create_Secure_E_Document(e_Invoice_Diction)
if (local_E_Invoice_status is False): if (local_E_Invoice_status is False):
return True, "WARNING : La facture a été créée avec la réf. "+str(new_invoice_data_header['invoice_header_ref_interne'])+"; mais impossible de créer la e-Facture Sécurisée.", str(new_invoice_data_header['invoice_header_ref_interne']) return True, "WARNING : La facture a été créée avec la réf. "+str(new_invoice_data_header['invoice_header_ref_interne'])+"; mais impossible de créer la e-Facture Sécurisée (1).", str(new_invoice_data_header['invoice_header_ref_interne'])
return True, " La commande a été correctement facturée", str(new_invoice_data_header['invoice_header_ref_interne']) return True, " La commande a été correctement facturée", str(new_invoice_data_header['invoice_header_ref_interne'])