07/10/2024 - 20h30

master
cherif 2024-10-07 20:17:17 +02:00
parent 0d4c96471d
commit 81f1556547
4 changed files with 1583 additions and 4 deletions

View File

@ -4,9 +4,7 @@
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="05/10/2024 - 18h30">
<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$/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$/partner_invoice.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_invoice.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/base_partner_catalog_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_partner_catalog_config.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" />

File diff suppressed because it is too large Load Diff

View File

@ -113,7 +113,7 @@ def Add_Update_Partner_Catalog_Pub_Config(diction):
'indicateur_2_txt', 'indicateur_2_taille', 'indicateur_2_color', 'indicateur_2_gras',
'indicateur_3_txt', 'indicateur_3_taille', 'indicateur_3_color', 'indicateur_3_gras',
'indicateur_4_txt', 'indicateur_4_taille', 'indicateur_4_color', 'indicateur_4_gras',
'cgv_pdf', 'cgu_pdf'
'cgv_pdf', 'cgu_pdf', 'mention_legale_pdf'
]
incom_keys = diction.keys()

View File

@ -6393,6 +6393,10 @@ def Get_Partner_Data_From_Subdomain(diction):
if (config_partner_catalog_data and "cgu_pdf" in config_partner_catalog_data.keys()):
user['catalog_pub_cgu_pdf'] = config_partner_catalog_data['cgu_pdf']
user['catalog_pub_mention_legale_pdf'] = ""
if (config_partner_catalog_data and "mention_legale_pdf" in config_partner_catalog_data.keys()):
user['catalog_pub_mention_legale_pdf'] = config_partner_catalog_data['mention_legale_pdf']
user['catalog_pub_logo'] = ""
if( config_partner_catalog_data and "logo" in config_partner_catalog_data.keys() ):