parent
64b3e6739a
commit
18fdf72633
|
|
@ -4,10 +4,11 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="04/05/2026 - 13h">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="04/05/2026 - 19h">
|
||||
<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$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/partner_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_client.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -452,7 +453,7 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1747251650255</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="572" />
|
||||
<option name="localTasksCounter" value="573" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
|
|
@ -494,7 +495,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="10/03/26 - 20h" />
|
||||
<MESSAGE value="14/03/2026 - 22h" />
|
||||
<MESSAGE value="17/03/2026 - 22h" />
|
||||
<MESSAGE value="18/03/2026 - 22h" />
|
||||
|
|
@ -519,6 +519,7 @@
|
|||
<MESSAGE value="28/04/26 - 19h" />
|
||||
<MESSAGE value="29/04/26 - 21h" />
|
||||
<MESSAGE value="04/05/2026 - 13h" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="04/05/2026 - 13h" />
|
||||
<MESSAGE value="04/05/2026 - 19h" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="04/05/2026 - 19h" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -6002,6 +6002,8 @@ def PrintAttendeeDetail_perSession(diction):
|
|||
my_retrun_dict['class_title'] = local_formation['title']
|
||||
my_local_title = local_formation['title']
|
||||
|
||||
|
||||
|
||||
local_query = {'_id':ObjectId(str(local_Insc_retval['session_id'])), 'valide':'1',
|
||||
'partner_owner_recid':str(partner_recid)}
|
||||
|
||||
|
|
@ -11793,9 +11795,11 @@ def GetAttendeeDetail_perSession_from_line_id(diction):
|
|||
mycommon.myprint(str(inspect.stack()[0][3]) + " - Impossible de récupérer les informations de la formation ")
|
||||
return False, " Impossible de récupérer les informations de la formation"
|
||||
|
||||
|
||||
|
||||
my_retrun_dict['class_title'] = local_formation['title']
|
||||
if ("is_ftion_initiale" in local_formation.keys()):
|
||||
my_retrun_dict['is_ftion_initiale'] = local_formation['is_ftion_initiale']
|
||||
else:
|
||||
my_retrun_dict['is_ftion_initiale'] = "0"
|
||||
|
||||
RetObject.append(mycommon.JSONEncoder().encode(my_retrun_dict))
|
||||
|
||||
|
|
|
|||
3156
Log/log_file.log
3156
Log/log_file.log
File diff suppressed because it is too large
Load Diff
|
|
@ -54,7 +54,7 @@ def Add_Partner_Client(diction):
|
|||
'contact_civilite', 'contact_nom', 'contact_prenom', 'contact_email', 'is_contact_communication',
|
||||
'contact_fonction', 'contact_mobile', 'contact_phone', 'contact_adresse', 'contact_code_postal',
|
||||
'contact_ville',
|
||||
'contact_pays', 'contact_siret', 'contact_tva', 'archive']
|
||||
'contact_pays', 'contact_siret', 'contact_tva', 'archive', 'client_facturation_id']
|
||||
|
||||
|
||||
|
||||
|
|
@ -127,10 +127,19 @@ def Add_Partner_Client(diction):
|
|||
return False, " - Vous avez déjà un client qui a le même email principal "
|
||||
|
||||
|
||||
if ("client_facturation_id" in diction.keys() and diction['client_facturation_id']):
|
||||
client_facturation_id_count = MYSY_GV.dbname['partner_client'].count_documents(
|
||||
{"_id": ObjectId(str(diction['client_facturation_id'])), 'valide': '1', 'locked': '0',
|
||||
'partner_owner_recid': str(my_partner['recid'])})
|
||||
|
||||
if (client_facturation_id_count != 1):
|
||||
mycommon.myprint(str(inspect.stack()[0][
|
||||
3]) + " L'identifiant du client facturé est invalide ")
|
||||
return False, " L'identifiant du client facturé est invalide "
|
||||
|
||||
"""
|
||||
Recuperation des données fournies en entrée
|
||||
"""
|
||||
Recuperation des données fournies en entrée
|
||||
"""
|
||||
data = {}
|
||||
data['partner_owner_recid'] = my_partner['recid']
|
||||
|
||||
|
|
@ -157,6 +166,11 @@ def Add_Partner_Client(diction):
|
|||
else:
|
||||
data['archive'] = "0"
|
||||
|
||||
if ("client_facturation_id" in diction.keys()):
|
||||
data['client_facturation_id'] = str(diction['client_facturation_id'])
|
||||
else:
|
||||
data['client_facturation_id'] = ""
|
||||
|
||||
|
||||
client_type_id = ""
|
||||
if ("client_type_id" in diction.keys()):
|
||||
|
|
@ -1150,7 +1164,8 @@ def Update_Partner_Client(diction):
|
|||
'invoice_tva','invoice_condition_paiement_id', 'invoice_adresse', 'invoice_ville',
|
||||
'invoice_code_postal', 'invoice_pays', 'invoice_telephone', 'client_type_id',
|
||||
'is_fournisseur', 'is_client', 'is_financeur', 'is_company', 'invoice_automatique',
|
||||
'type_financeur_id', 'type_pouvoir_public_id', 'partner_groupe_client_id', 'archive']
|
||||
'type_financeur_id', 'type_pouvoir_public_id', 'partner_groupe_client_id', 'archive',
|
||||
'client_facturation_id']
|
||||
|
||||
incom_keys = diction.keys()
|
||||
for val in incom_keys:
|
||||
|
|
@ -1202,6 +1217,14 @@ def Update_Partner_Client(diction):
|
|||
return False, " L'identifiant du client est invalide "
|
||||
|
||||
|
||||
if( "client_facturation_id" in diction.keys() and diction['client_facturation_id']):
|
||||
client_facturation_id_count = MYSY_GV.dbname['partner_client'].count_documents({"_id":ObjectId(str(diction['client_facturation_id'])), 'valide':'1', 'locked':'0',
|
||||
'partner_owner_recid':str(my_partner['recid'])})
|
||||
|
||||
if (client_facturation_id_count != 1):
|
||||
mycommon.myprint(str(inspect.stack()[0][
|
||||
3]) + " L'identifiant du client facturé est invalide ")
|
||||
return False, " L'identifiant du client facturé est invalide "
|
||||
|
||||
"""
|
||||
Recuperation des données fournies en entrée
|
||||
|
|
@ -1236,6 +1259,9 @@ def Update_Partner_Client(diction):
|
|||
if ("archive" in diction.keys()):
|
||||
data_update['archive'] = diction['archive']
|
||||
|
||||
if ("client_facturation_id" in diction.keys()):
|
||||
data_update['client_facturation_id'] = diction['client_facturation_id']
|
||||
|
||||
|
||||
if ("invoice_automatique" in diction.keys()):
|
||||
data_update['invoice_automatique'] = diction['invoice_automatique']
|
||||
|
|
@ -1612,7 +1638,21 @@ def Get_Partner_List_Partner_Client(diction):
|
|||
if( partner_groupe_client_data and "code" in partner_groupe_client_data.keys()):
|
||||
partner_groupe_client_code = partner_groupe_client_data['code']
|
||||
|
||||
user['partner_groupe_client_code'] = partner_groupe_client_code
|
||||
user['partner_groupe_client_code'] = partner_groupe_client_code
|
||||
|
||||
if( "client_facturation_id" in user.keys() and user['client_facturation_id']):
|
||||
client_facture_data = MYSY_GV.dbname['partner_client'].find_one({'_id':ObjectId(str(user['client_facturation_id'])),
|
||||
'partner_owner_recid':str(my_partner['recid']),
|
||||
'valide':'1'})
|
||||
|
||||
if( client_facture_data and 'raison_sociale' in client_facture_data.keys()):
|
||||
user['client_facturation_raison_sociale'] = client_facture_data['raison_sociale']
|
||||
else:
|
||||
user['client_facturation_id'] = ""
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
else:
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
val_tmp = val_tmp + 1
|
||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||
|
|
@ -1651,7 +1691,7 @@ def Get_Partner_List_Partner_Client_with_filter_Like(diction):
|
|||
field_list = ['token', 'raison_sociale', 'nom', 'email',
|
||||
'is_client', 'is_financeur', 'is_fournisseur',
|
||||
'archive', 'groupe_client', 'type_client', 'typologie',
|
||||
'categorie']
|
||||
'categorie', 'not_id']
|
||||
|
||||
incom_keys = diction.keys()
|
||||
for val in incom_keys:
|
||||
|
|
@ -1693,6 +1733,11 @@ def Get_Partner_List_Partner_Client_with_filter_Like(diction):
|
|||
elif ("archive" not in diction.keys()):
|
||||
filt_archive = {'archive': {'$ne': '1'}}
|
||||
|
||||
filt_not_id = {}
|
||||
if( "not_id" in diction.keys() and diction['not_id']):
|
||||
filt_not_id = {'_id':{'$ne':ObjectId(diction['not_id'])}}
|
||||
|
||||
|
||||
|
||||
|
||||
filt_raison_sociale = {}
|
||||
|
|
@ -1763,7 +1808,7 @@ def Get_Partner_List_Partner_Client_with_filter_Like(diction):
|
|||
|
||||
qry = {'$and': [filt_archive, qry_gle, filt_client_is_client,
|
||||
filt_client_is_financeur,filt_client_is_fournisseur, {'partner_owner_recid': str(my_partner['recid'])}, filt_groupe_client_id,
|
||||
filt_categorie, filt_typologie, filt_type_client_id
|
||||
filt_categorie, filt_typologie, filt_type_client_id, filt_not_id
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -1812,6 +1857,21 @@ def Get_Partner_List_Partner_Client_with_filter_Like(diction):
|
|||
|
||||
user['partner_groupe_client_code'] = partner_groupe_client_code
|
||||
|
||||
if ("client_facturation_id" in user.keys() and user['client_facturation_id']):
|
||||
client_facture_data = MYSY_GV.dbname['partner_client'].find_one(
|
||||
{'_id': ObjectId(str(user['client_facturation_id'])),
|
||||
'partner_owner_recid': str(my_partner['recid']),
|
||||
'valide': '1'})
|
||||
|
||||
if (client_facture_data and 'raison_sociale' in client_facture_data.keys()):
|
||||
user['client_facturation_raison_sociale'] = client_facture_data['raison_sociale']
|
||||
else:
|
||||
user['client_facturation_id'] = ""
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
else:
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||
|
||||
return True, RetObject
|
||||
|
|
@ -1948,6 +2008,21 @@ def Get_Given_Partner_Client(diction):
|
|||
|
||||
user['partner_groupe_client_code'] = partner_groupe_client_code
|
||||
|
||||
if ("client_facturation_id" in user.keys() and user['client_facturation_id']):
|
||||
client_facture_data = MYSY_GV.dbname['partner_client'].find_one(
|
||||
{'_id': ObjectId(str(user['client_facturation_id'])),
|
||||
'partner_owner_recid': str(my_partner['recid']),
|
||||
'valide': '1'})
|
||||
|
||||
if (client_facture_data and 'raison_sociale' in client_facture_data.keys()):
|
||||
user['client_facturation_raison_sociale'] = client_facture_data['raison_sociale']
|
||||
else:
|
||||
user['client_facturation_id'] = ""
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
else:
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||
|
||||
#print(" ### RetObject = ", RetObject)
|
||||
|
|
@ -2081,6 +2156,21 @@ def Get_Given_Partner_Client_From_Id(diction):
|
|||
|
||||
user['partner_groupe_client_code'] = partner_groupe_client_code
|
||||
|
||||
if ("client_facturation_id" in user.keys() and user['client_facturation_id']):
|
||||
client_facture_data = MYSY_GV.dbname['partner_client'].find_one(
|
||||
{'_id': ObjectId(str(user['client_facturation_id'])),
|
||||
'partner_owner_recid': str(my_partner['recid']),
|
||||
'valide': '1'})
|
||||
|
||||
if (client_facture_data and 'raison_sociale' in client_facture_data.keys()):
|
||||
user['client_facturation_raison_sociale'] = client_facture_data['raison_sociale']
|
||||
else:
|
||||
user['client_facturation_id'] = ""
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
else:
|
||||
user['client_facturation_raison_sociale'] = ""
|
||||
|
||||
|
||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||
|
||||
|
|
|
|||
|
|
@ -3814,6 +3814,12 @@ def GetAttendeeDetail_perSession(diction):
|
|||
my_retrun_dict['class_id'] = local_formation['_id']
|
||||
my_retrun_dict['class_title'] = local_formation['title']
|
||||
|
||||
if( "is_ftion_initiale" in local_formation.keys()):
|
||||
my_retrun_dict['is_ftion_initiale'] = local_formation['is_ftion_initiale']
|
||||
else:
|
||||
my_retrun_dict['is_ftion_initiale'] = "0"
|
||||
|
||||
|
||||
|
||||
|
||||
RetObject.append(JSONEncoder().encode(my_retrun_dict))
|
||||
|
|
|
|||
Loading…
Reference in New Issue