From 0d1b1703ccefc12cd4198e4264f73e98c899e9c5 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:15:39 +0200 Subject: [PATCH 1/2] FIX: missing prospect/customer category translation (#35814) --- htdocs/langs/en_US/companies.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 15e6d8e0280..ac22e6133ee 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -256,6 +256,7 @@ VATIntraSyntaxIsValid=Syntax is valid VATPaymentFrequency=VAT payment frequency ProspectCustomer=Prospect / Customer Prospect=Prospect +ProspectsOrCustomers=Prospects or customers CustomerCard=Customer Card Customer=Customer CustomerRelativeDiscount=Relative customer discount From da32ca92282764ab6f6035709380bd39d5e935bd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 17 Oct 2025 18:11:29 +0200 Subject: [PATCH 2/2] FIX wrong entity alias (#35821) --- htdocs/comm/propal/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index b52e64f0637..e15f131b167 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -586,7 +586,7 @@ $sql .= " typent.code as typent_code,"; $sql .= " ava.rowid as availability,"; $sql .= " country.code as country_code,"; $sql .= " state.code_departement as state_code, state.nom as state_name,"; -$sql .= ' p.rowid, p.entity as propal_entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.import_key, p.fk_user_author, p.datep as dp, p.fin_validite as dfv, p.date_livraison as ddelivery,'; +$sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.import_key, p.fk_user_author, p.datep as dp, p.fin_validite as dfv, p.date_livraison as ddelivery,'; $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc,'; $sql .= ' p.datec as date_creation, p.tms as date_modification, p.date_cloture as date_cloture,'; $sql .= ' p.date_signature as dsignature,'; @@ -1890,7 +1890,7 @@ while ($i < $imaxinloop) { // Other picto tool print ''; $filename = dol_sanitizeFileName($obj->ref); - $filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref); + $filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref); $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid; print $formfile->getDocumentsLink($object->element, $filename, $filedir); print '';