From 7e44494a98ed74a4e517dc63cac2146b7965d23c Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:24:30 +0200 Subject: [PATCH 1/6] Fix Title supplier proposal card --- htdocs/supplier_proposal/card.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 809e84b29a8..65b3addf9d1 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1035,10 +1035,9 @@ if (empty($reshook)) { /* * View */ - +$title = $langs->trans('CommRequests')." - ".$langs->trans('Card'); $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; - -llxHeader('', $langs->trans('CommRequests'), $help_url); +llxHeader('', $title, $help_url); $form = new Form($db); $formother = new FormOther($db); From c0062e2d414c1fd5e59c267f2d2090afe5249817 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:26:58 +0200 Subject: [PATCH 2/6] Move title to v14 ergonomy --- htdocs/core/lib/supplier_proposal.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php index a7720bd9ef4..4361bbe3ae7 100644 --- a/htdocs/core/lib/supplier_proposal.lib.php +++ b/htdocs/core/lib/supplier_proposal.lib.php @@ -40,7 +40,7 @@ function supplier_proposal_prepare_head($object) $head = array(); $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id; - $head[$h][1] = $langs->trans('SupplierProposalCard'); + $head[$h][1] = $langs->trans('SupplierProposal'); $head[$h][2] = 'comm'; $h++; From 100b0f297e897e055a146c71bc9e9d19f35734b2 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:32:28 +0200 Subject: [PATCH 3/6] Fix Title supplier proposal contact card --- htdocs/core/lib/supplier_proposal.lib.php | 2 +- htdocs/supplier_proposal/contact.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php index 4361bbe3ae7..e5c0ed7dbf9 100644 --- a/htdocs/core/lib/supplier_proposal.lib.php +++ b/htdocs/core/lib/supplier_proposal.lib.php @@ -40,7 +40,7 @@ function supplier_proposal_prepare_head($object) $head = array(); $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id; - $head[$h][1] = $langs->trans('SupplierProposal'); + $head[$h][1] = $langs->trans('CommRequests'); $head[$h][2] = 'comm'; $h++; diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php index 0ba4485361d..de2ac359321 100644 --- a/htdocs/supplier_proposal/contact.php +++ b/htdocs/supplier_proposal/contact.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; // Load translation files required by the page -$langs->loadLangs(array("propal", "facture", "orders", "sendings", "companies")); +$langs->loadLangs(array("propal", "supplier_proposal", "facture", "orders", "sendings", "companies")); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); @@ -98,7 +98,9 @@ if ($action == 'addcontact' && $permissiontoedit) { /* * View */ - +$title = $langs->trans('CommRequests')." - ".$langs->trans('ContactsAddresses'); +$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; +llxHeader('', $title, $help_url); $help_url = ''; llxHeader('', $langs->trans("SupplierProposals"), $help_url); From d66d38a8461e9419a44ae6713d28490635a1a5b4 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:36:22 +0200 Subject: [PATCH 4/6] Fix Title supplier proposal note card --- htdocs/supplier_proposal/card.php | 2 +- htdocs/supplier_proposal/contact.php | 4 +--- htdocs/supplier_proposal/note.php | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 65b3addf9d1..cad41f905ef 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1035,7 +1035,7 @@ if (empty($reshook)) { /* * View */ -$title = $langs->trans('CommRequests')." - ".$langs->trans('Card'); +$title = $langs->trans('CommRequest')." - ".$langs->trans('Card'); $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; llxHeader('', $title, $help_url); diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php index de2ac359321..02a4fc51966 100644 --- a/htdocs/supplier_proposal/contact.php +++ b/htdocs/supplier_proposal/contact.php @@ -98,11 +98,9 @@ if ($action == 'addcontact' && $permissiontoedit) { /* * View */ -$title = $langs->trans('CommRequests')." - ".$langs->trans('ContactsAddresses'); +$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses'); $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; llxHeader('', $title, $help_url); -$help_url = ''; -llxHeader('', $langs->trans("SupplierProposals"), $help_url); $form = new Form($db); $formcompany = new FormCompany($db); diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php index 372b6b6d20b..d16bc90033e 100644 --- a/htdocs/supplier_proposal/note.php +++ b/htdocs/supplier_proposal/note.php @@ -61,8 +61,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, /* * View */ - -llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); +$title = $langs->trans('CommRequest')." - ".$langs->trans('Notes'); +$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; +llxHeader('', $title, $help_url); $form = new Form($db); From 7a105a054aea226d5f07355951f89f40409e5feb Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:40:01 +0200 Subject: [PATCH 5/6] Fix Title supplier proposal info card --- htdocs/supplier_proposal/info.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php index 77268671275..80c67871e91 100644 --- a/htdocs/supplier_proposal/info.php +++ b/htdocs/supplier_proposal/info.php @@ -51,7 +51,9 @@ $result = restrictedArea($user, 'supplier_proposal', $id); $form = new Form($db); -llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); +$title = $langs->trans('CommRequest')." - ".$langs->trans('Info'); +$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; +llxHeader('', $title, $help_url); $object = new SupplierProposal($db); $object->fetch($id); From 6089332a2b8516ea1abe0013a291838ef0d3c112 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 10 May 2021 06:40:14 +0200 Subject: [PATCH 6/6] Fix Title supplier proposal document card --- htdocs/supplier_proposal/document.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 1a61ba5620e..eaf02981966 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -36,7 +36,7 @@ if (!empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } // Load translation files required by the page -$langs->loadLangs(array('compta', 'other')); +$langs->loadLangs(array('compta', 'supplier_proposal', 'other')); $action = GETPOST('action', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); @@ -80,8 +80,9 @@ if ($object->id > 0) { /* * View */ - -llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); +$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents'); +$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; +llxHeader('', $title, $help_url); $form = new Form($db);