04/03/2024 - 22h15

master
cherif 2024-03-04 22:16:57 +01:00
parent 3f44c222b8
commit b97157962d
3 changed files with 3135 additions and 15 deletions

View File

@ -1,7 +1,7 @@
<?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="02/03/2024 - 23h20"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="sss">
<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$/crm_opportunite.py" beforeDir="false" afterPath="$PROJECT_DIR$/crm_opportunite.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/crm_opportunite.py" beforeDir="false" afterPath="$PROJECT_DIR$/crm_opportunite.py" afterDir="false" />
@ -74,13 +74,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00185" summary="01/01/2024- 18h">
<created>1704127826604</created>
<option name="number" value="00185" />
<option name="presentableId" value="LOCAL-00185" />
<option name="project" value="LOCAL" />
<updated>1704127826605</updated>
</task>
<task id="LOCAL-00186" summary="03/01/2024 - 17h30"> <task id="LOCAL-00186" summary="03/01/2024 - 17h30">
<created>1704298822115</created> <created>1704298822115</created>
<option name="number" value="00186" /> <option name="number" value="00186" />
@ -417,7 +410,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1709418064501</updated> <updated>1709418064501</updated>
</task> </task>
<option name="localTasksCounter" value="234" /> <task id="LOCAL-00234" summary="sss">
<created>1709567569246</created>
<option name="number" value="00234" />
<option name="presentableId" value="LOCAL-00234" />
<option name="project" value="LOCAL" />
<updated>1709567569247</updated>
</task>
<option name="localTasksCounter" value="235" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -432,7 +432,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="02/02/2024 - 23h" />
<MESSAGE value="03/02/2024 - 21h" /> <MESSAGE value="03/02/2024 - 21h" />
<MESSAGE value="04/02/2024 - 21h" /> <MESSAGE value="04/02/2024 - 21h" />
<MESSAGE value="04/02/2024 - 23h" /> <MESSAGE value="04/02/2024 - 23h" />
@ -457,6 +456,7 @@
<MESSAGE value="29/02/2024 - 21h30" /> <MESSAGE value="29/02/2024 - 21h30" />
<MESSAGE value="01/03/2024 - 23h30" /> <MESSAGE value="01/03/2024 - 23h30" />
<MESSAGE value="02/03/2024 - 23h20" /> <MESSAGE value="02/03/2024 - 23h20" />
<option name="LAST_COMMIT_MESSAGE" value="02/03/2024 - 23h20" /> <MESSAGE value="sss" />
<option name="LAST_COMMIT_MESSAGE" value="sss" />
</component> </component>
</project> </project>

File diff suppressed because it is too large Load Diff

View File

@ -385,11 +385,22 @@ def Get_List_CRM_Opportunite_with_filter(diction):
qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0'} qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0'}
query_with_filter = {'$and': [qry, filt_vendeur_id ]} query_with_filter = {'$and': [qry, filt_vendeur_id ]}
for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(query_with_filter): for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(query_with_filter).sort([("_id", pymongo.DESCENDING), ]):
user = New_retVal user = New_retVal
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
client_nom = ""
if ("partner_client_id" in New_retVal.keys() and New_retVal['partner_client_id']):
partner_client_data = MYSY_GV.dbname['partner_client'].find_one(
{'_id': ObjectId(str(New_retVal['partner_client_id'])), 'valide': '1', 'locked': '0',
'partner_recid': str(my_partner['recid'])})
if ("nom" in partner_client_data.keys()):
client_nom = partner_client_data['nom']
user['client_nom'] = client_nom
vendeur_nom = "" vendeur_nom = ""
vendeur_prenom = "" vendeur_prenom = ""
if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']): if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']):
@ -500,13 +511,25 @@ def Get_List_CRM_Opportunite_no_filter(diction):
qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0'} qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0'}
print(" ### qry 11 = ", qry)
for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(qry):
for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(qry).sort([("_id", pymongo.DESCENDING), ]):
user = New_retVal user = New_retVal
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
client_nom = ""
if ("partner_client_id" in New_retVal.keys() and New_retVal['partner_client_id']):
partner_client_data = MYSY_GV.dbname['partner_client'].find_one(
{'_id': ObjectId(str(New_retVal['partner_client_id'])), 'valide': '1', 'locked': '0',
'partner_recid': str(my_partner['recid'])})
if ("nom" in partner_client_data.keys()):
client_nom = partner_client_data['nom']
user['client_nom'] = client_nom
vendeur_nom = "" vendeur_nom = ""
vendeur_prenom = "" vendeur_prenom = ""
if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']): if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']):
@ -612,11 +635,22 @@ def Get_Given_CRM_Opportunite(diction):
qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0', '_id':ObjectId(str(diction['opport_id']))} qry = {"partner_owner_recid":str(my_partner['recid']), 'valide':'1', 'locked':'0', '_id':ObjectId(str(diction['opport_id']))}
for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(qry): for New_retVal in MYSY_GV.dbname['crm_opportunite'].find(qry).sort([("_id", pymongo.DESCENDING), ]):
user = New_retVal user = New_retVal
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
client_nom = ""
if ("partner_client_id" in New_retVal.keys() and New_retVal['partner_client_id']):
partner_client_data = MYSY_GV.dbname['partner_client'].find_one(
{'_id': ObjectId(str(New_retVal['partner_client_id'])), 'valide': '1', 'locked': '0',
'partner_recid': str(my_partner['recid'])})
if ("nom" in partner_client_data.keys()):
client_nom = partner_client_data['nom']
user['client_nom'] = client_nom
vendeur_nom = "" vendeur_nom = ""
vendeur_prenom = "" vendeur_prenom = ""
if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']): if( "vendeur_id" in New_retVal.keys() and New_retVal['vendeur_id']):