Merge pull request #17554 from aspangaro/14b4

Fix Title customer order
This commit is contained in:
Laurent Destailleur 2021-05-11 18:19:11 +02:00 committed by GitHub
commit f87f80b004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 12 deletions

View File

@ -1392,8 +1392,9 @@ if (empty($reshook)) {
/* /*
* View * View
*/ */
$title = $langs->trans('Order')." - ".$langs->trans('Card');
llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);

View File

@ -103,8 +103,9 @@ elseif ($action == 'setaddress' && $user->rights->commande->creer)
/* /*
* View * View
*/ */
$title = $langs->trans('Order')." - ".$langs->trans('ContactsAddresses');
llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);

View File

@ -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('companies', 'other', 'bills')); $langs->loadLangs(array('companies', 'other', 'bills', 'orders'));
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm'); $confirm = GETPOST('confirm');
@ -94,8 +94,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/* /*
* View * View
*/ */
$title = $langs->trans('Order')." - ".$langs->trans('Documents');
llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);

View File

@ -62,7 +62,9 @@ if (!$object->fetch($id, $ref) > 0) {
$form = new Form($db); $form = new Form($db);
llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); $title = $langs->trans('Order')." - ".$langs->trans('Info');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
$object->info($object->id); $object->info($object->id);

View File

@ -67,8 +67,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
/* /*
* View * View
*/ */
$title = $langs->trans('Order')." - ".$langs->trans('Notes');
llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
$form = new Form($db); $form = new Form($db);

View File

@ -48,7 +48,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
} }
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('orders', "companies", "bills", 'propal', 'deliveries', 'stocks', "productbatch", 'incoterm', 'other')); $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'deliveries', 'stocks', 'productbatch', 'incoterm', 'other'));
$id = GETPOST('id', 'int'); // id of order $id = GETPOST('id', 'int'); // id of order
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
@ -232,7 +232,9 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
} }
llxHeader('', $langs->trans('OrderCard'), ''); $title = $langs->trans('Order')." - ".$langs->trans('Shipments');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
if ($id > 0 || !empty($ref)) { if ($id > 0 || !empty($ref)) {