Merge pull request #17552 from aspangaro/14b2

Fix Title customer proposal
This commit is contained in:
Laurent Destailleur 2021-05-11 18:55:02 +02:00 committed by GitHub
commit 8024e769fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 9 deletions

View File

@ -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();

View File

@ -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');
$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
llxHeader('', $title, $help_url);
$form = new Form($db);
$formcompany = new FormCompany($db);

View File

@ -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');
@ -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);

View File

@ -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();

View File

@ -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) {