From 2dc2256545b3e2188d1eb5c290fcbe54af65c20a Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 9 May 2021 21:08:55 +0200 Subject: [PATCH 1/5] Fix Title customer proposal card --- htdocs/comm/propal/card.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 229303849f0..29310aa831b 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1445,8 +1445,9 @@ if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } +$title = $langs->trans('Proposal')." - ".$langs->trans('Card'); $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote'; -llxHeader('', $langs->trans('Proposal'), $help_url); +llxHeader('', $title, $help_url); $now = dol_now(); From dd76ff0f24e929d3a8af0be707b5d00faa85baba Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 9 May 2021 21:11:14 +0200 Subject: [PATCH 2/5] Fix Title customer proposal contact card --- htdocs/comm/propal/contact.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 09aa9fddb6c..80468894483 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -118,8 +118,9 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer) /* * View */ - -llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'); +$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses'); +$helpurl = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos"; +llxHeader('', $title, $helpurl); $form = new Form($db); $formcompany = new FormCompany($db); From dbccb75294e2672587bd74af2d4e9b7f5e8d0779 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 9 May 2021 21:13:29 +0200 Subject: [PATCH 3/5] Fix Title customer proposal notes card --- htdocs/comm/propal/contact.php | 4 ++-- htdocs/comm/propal/note.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 80468894483..61a14ab62d8 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -119,8 +119,8 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer) * View */ $title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses'); -$helpurl = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos"; -llxHeader('', $title, $helpurl); +$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos"; +llxHeader('', $title, $help_url); $form = new Form($db); $formcompany = new FormCompany($db); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 0d880219bef..6dd62a9990d 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -71,9 +71,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, $form = new Form($db); +$title = $langs->trans('Proposal')." - ".$langs->trans('Notes'); $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'; - -llxHeader('', $langs->trans('Proposal'), $help_url); +llxHeader('', $title, $help_url); if ($object->id > 0) { if ($object->fetch_thirdparty() > 0) { From 9cec7e5936f9ead5c67cb2e956990e454130c32f Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 9 May 2021 21:15:54 +0200 Subject: [PATCH 4/5] Fix Title customer proposal documents card --- htdocs/comm/propal/document.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 1a71d4ffaba..d9416dfe339 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -102,8 +102,9 @@ if ($object->id > 0) { /* * View */ - -llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'); +$title = $langs->trans('Proposal')." - ".$langs->trans('Documents'); +$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'; +llxHeader('', $title, $help_url); $form = new Form($db); From c2319c0a20c4adb8bc672208c6263907e5ae0442 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 9 May 2021 21:19:13 +0200 Subject: [PATCH 5/5] Fix Title customer proposal info card --- htdocs/comm/propal/document.php | 2 +- htdocs/comm/propal/info.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index d9416dfe339..4e592c8371e 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) { } // Load translation files required by the page -$langs->loadLangs(array('compta', 'other', 'companies')); +$langs->loadLangs(array('propal', 'compta', 'other', 'companies')); $action = GETPOST('action', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index 72e4f887496..798dc87bcfd 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -59,7 +59,9 @@ restrictedArea($user, 'propal', $object->id); $form = new Form($db); -llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'); +$title = $langs->trans('Proposal')." - ".$langs->trans('Info'); +$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'; +llxHeader('', $title, $help_url); $object->fetch_thirdparty();