Merge pull request #17558 from aspangaro/14b6

Fix Title supplier proposal
This commit is contained in:
Laurent Destailleur 2021-05-11 18:18:35 +02:00 committed by GitHub
commit eab3ac0615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 14 deletions

View File

@ -40,7 +40,7 @@ function supplier_proposal_prepare_head($object)
$head = array(); $head = array();
$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
$head[$h][1] = $langs->trans('SupplierProposalCard'); $head[$h][1] = $langs->trans('CommRequests');
$head[$h][2] = 'comm'; $head[$h][2] = 'comm';
$h++; $h++;

View File

@ -1035,10 +1035,9 @@ if (empty($reshook)) {
/* /*
* View * View
*/ */
$title = $langs->trans('CommRequest')." - ".$langs->trans('Card');
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'; $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $title, $help_url);
llxHeader('', $langs->trans('CommRequests'), $help_url);
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);

View File

@ -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'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
// Load translation files required by the page // 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'); $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
@ -98,9 +98,9 @@ if ($action == 'addcontact' && $permissiontoedit) {
/* /*
* View * View
*/ */
$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses');
$help_url = ''; $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $langs->trans("SupplierProposals"), $help_url); llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);

View File

@ -36,7 +36,7 @@ if (!empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
} }
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('compta', 'other')); $langs->loadLangs(array('compta', 'supplier_proposal', 'other'));
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');
@ -80,8 +80,9 @@ if ($object->id > 0) {
/* /*
* View * View
*/ */
$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);

View File

@ -51,7 +51,9 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
$form = new Form($db); $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 = new SupplierProposal($db);
$object->fetch($id); $object->fetch($id);

View File

@ -61,8 +61,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
/* /*
* View * View
*/ */
$title = $langs->trans('CommRequest')." - ".$langs->trans('Notes');
llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur'); $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);