Merge pull request #17552 from aspangaro/14b2
Fix Title customer proposal
This commit is contained in:
commit
8024e769fd
@ -1445,8 +1445,9 @@ if (!empty($conf->projet->enabled)) {
|
|||||||
$formproject = new FormProjets($db);
|
$formproject = new FormProjets($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$title = $langs->trans('Proposal')." - ".$langs->trans('Card');
|
||||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
|
$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();
|
$now = dol_now();
|
||||||
|
|
||||||
|
|||||||
@ -118,8 +118,9 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer)
|
|||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
|
||||||
llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
|
$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
|
||||||
|
llxHeader('', $title, $help_url);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
$formcompany = new FormCompany($db);
|
$formcompany = new FormCompany($db);
|
||||||
|
|||||||
@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Load translation files required by the page
|
// Load translation files required by the page
|
||||||
$langs->loadLangs(array('compta', 'other', 'companies'));
|
$langs->loadLangs(array('propal', 'compta', 'other', 'companies'));
|
||||||
|
|
||||||
$action = GETPOST('action', 'alpha');
|
$action = GETPOST('action', 'alpha');
|
||||||
$confirm = GETPOST('confirm', 'alpha');
|
$confirm = GETPOST('confirm', 'alpha');
|
||||||
@ -102,8 +102,9 @@ if ($object->id > 0) {
|
|||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
$title = $langs->trans('Proposal')." - ".$langs->trans('Documents');
|
||||||
llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
|
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||||
|
llxHeader('', $title, $help_url);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
|
|||||||
@ -59,7 +59,9 @@ restrictedArea($user, 'propal', $object->id);
|
|||||||
|
|
||||||
$form = new Form($db);
|
$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();
|
$object->fetch_thirdparty();
|
||||||
|
|
||||||
|
|||||||
@ -71,9 +71,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
|
|||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
|
$title = $langs->trans('Proposal')." - ".$langs->trans('Notes');
|
||||||
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
|
||||||
|
llxHeader('', $title, $help_url);
|
||||||
llxHeader('', $langs->trans('Proposal'), $help_url);
|
|
||||||
|
|
||||||
if ($object->id > 0) {
|
if ($object->id > 0) {
|
||||||
if ($object->fetch_thirdparty() > 0) {
|
if ($object->fetch_thirdparty() > 0) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user