diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index c56f1840ab7..5ea0636cc16 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1463,8 +1463,12 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db);
}
-$title = $langs->trans('Proposal')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewPropal");
+}
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
+
llxHeader('', $title, $help_url);
$now = dol_now();
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index fedf6a6233d..ceb25175596 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -118,8 +118,9 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer)
/*
* View
*/
-$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
+$title = $object->ref." - ".$langs->trans('ContactsAddresses');
$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
+
llxHeader('', $title, $help_url);
$form = new Form($db);
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 804fedd623b..b6fbb97cdf7 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -104,7 +104,7 @@ if ($object->id > 0) {
/*
* View
*/
-$title = $langs->trans('Proposal')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
llxHeader('', $title, $help_url);
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index dc43af9ceff..1782e39e2d2 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -59,7 +59,7 @@ restrictedArea($user, 'propal', $object->id);
$form = new Form($db);
-$title = $langs->trans('Proposal')." - ".$langs->trans('Info');
+$title = $object->ref." - ".$langs->trans('Info');
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
llxHeader('', $title, $help_url);
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e0eb8a23e3e..38ad80d964f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -491,8 +491,9 @@ $companystatic = new Societe($db);
$projectstatic = new Project($db);
$formcompany = new FormCompany($db);
+$title = $langs->trans('ListOfProposals');
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-//llxHeader('',$langs->trans('Proposal'),$help_url);
+llxHeader('', $title, $help_url);
$sql = 'SELECT';
if ($sall || $search_product_category > 0 || $search_user > 0) {
@@ -750,7 +751,7 @@ if ($resql) {
exit;
}
- llxHeader('', $langs->trans('Proposal'), $help_url);
+// llxHeader('', $langs->trans('Proposal'), $help_url);
$param = '&search_status='.urlencode($search_status);
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 13fa42edb29..6aba2973975 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -81,8 +81,9 @@ if (empty($reshook)) {
$form = new Form($db);
-$title = $langs->trans('Proposal')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+
llxHeader('', $title, $help_url);
if ($object->id > 0) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 20bc5462d5e..401622957c7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1428,8 +1428,12 @@ if (empty($reshook)) {
* View
*/
-$title = $langs->trans('Order')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewOrder");
+}
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+
llxHeader('', $title, $help_url);
$form = new Form($db);
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index a4d857a47fd..b3b1319fa76 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -103,10 +103,6 @@ elseif ($action == 'setaddress' && $user->rights->commande->creer)
/*
* View
*/
-$title = $langs->trans('Order')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
-llxHeader('', $title, $help_url);
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$formother = new FormOther($db);
@@ -124,6 +120,10 @@ if ($id > 0 || !empty($ref)) {
if ($object->fetch($id, $ref) > 0) {
$object->fetch_thirdparty();
+ $title = $object->ref." - ".$langs->trans('ContactsAddresses');
+ $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+ llxHeader('', $title, $help_url);
+
$head = commande_prepare_head($object);
print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 684d8e61334..0e96c21db97 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -96,7 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
* View
*/
-$title = $langs->trans('Order')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 55140c30ae2..961aec01fa4 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -77,7 +77,7 @@ if (empty($reshook)) {
/*
* View
*/
-$title = $langs->trans('Order')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 36a9d17315a..e1d0f7b8382 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -60,11 +60,6 @@ if (!$year_start) {
/*
* View
*/
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("IOMonthlyReporting");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
$form = new Form($db);
// Get account informations
@@ -78,6 +73,10 @@ if (!empty($ref)) {
$id = $object->id;
}
+$title = $object->ref.' - '.$langs->trans("IOMonthlyReporting");
+$helpurl = "";
+llxHeader('', $title, $helpurl);
+
// Ce rapport de tresorerie est base sur llx_bank (car doit inclure les transactions sans facture)
// plutot que sur llx_paiement + llx_paiementfourn
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 421080951f2..5c4d7824a82 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -506,7 +506,7 @@ $buttonreconcile = '';
$morehtmlref = '';
if ($id > 0 || !empty($ref)) {
- $title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
+ $title = $object->ref.' - '.$langs->trans("Transactions");
$helpurl = "";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 5c91a9f504d..cbf7b75a3b3 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -329,18 +329,16 @@ if (!empty($conf->accounting->enabled)) {
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
-
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
-llxHeader("", $title, $help_url);
-
-
// Creation
if ($action == 'create') {
$object = new Account($db);
+ $title = $langs->trans("NewFinancialAccount");
+ llxHeader("", $title, $help_url);
+
print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
if ($conf->use_javascript_ajax) {
@@ -605,6 +603,9 @@ if ($action == 'create') {
$_GET["id"] = $object->id;
}
+ $title = $object->ref." - ".$langs->trans("Card");
+ llxHeader("", $title, $help_url);
+
// Show tabs
$head = bank_prepare_head($object);
print dol_get_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 78d45beadf3..91f514948a6 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -93,8 +93,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
* View
*/
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
-
+$title = $object->ref.' - '.$langs->trans("Documents");
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 4c0efec57d2..119266b7901 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -55,11 +55,6 @@ $error = 0;
/*
* View
*/
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Graph");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
$form = new Form($db);
$datetime = dol_now();
@@ -83,6 +78,10 @@ if (GETPOST("ref")) {
$account = $object->id;
}
+$title = $object->ref.' - '.$langs->trans("Graph");
+$helpurl = "";
+llxHeader('', $title, $helpurl);
+
$result = dol_mkdir($conf->bank->dir_temp);
if ($result < 0) {
$langs->load("errors");
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 2385f2210a5..624830dfb1d 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -194,11 +194,6 @@ if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($n
/*
* View
*/
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
$form = new Form($db);
$societestatic = new Societe($db);
$chargestatic = new ChargeSociales($db);
@@ -250,6 +245,10 @@ if (empty($numref)) {
$numrows = $db->num_rows($result);
$i = 0;
+ $title = $object->ref.' - '.$langs->trans("AccountStatements");
+ $helpurl = "";
+ llxHeader('', $title, $helpurl);
+
// Onglets
$head = bank_prepare_head($object);
print dol_get_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 98a51947c0e..94711d1cfe9 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -57,11 +57,6 @@ $hookmanager->initHooks(array('banktreso', 'globalcard'));
/*
* View
*/
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("PlannedTransactions");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
$societestatic = new Societe($db);
$facturestatic = new Facture($db);
$facturefournstatic = new FactureFournisseur($db);
@@ -85,6 +80,9 @@ if (GETPOST("account") || GETPOST("ref")) {
$_GET["account"] = $object->id;
}
+ $title = $object->ref.' - '.$langs->trans("PlannedTransactions");
+ $helpurl = "";
+ llxHeader('', $title, $helpurl);
// Onglets
$head = bank_prepare_head($object);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ab4b24e3889..254507db375 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -304,9 +304,6 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
/*
* View
*/
-
-llxHeader("", $langs->trans("VariousPayment"));
-
$form = new Form($db);
if (!empty($conf->accounting->enabled)) {
$formaccounting = new FormAccounting($db);
@@ -324,6 +321,13 @@ if ($id) {
}
}
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewVariousPayment");
+}
+$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
+llxHeader('', $title, $help_url);
+
$options = array();
// Load bank groups
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index bbec4f23fc6..7831a1b7ba0 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -290,7 +290,7 @@ if ($result) {
}
// must be place behind the last "header(...)" call
- llxHeader();
+ llxHeader('', $langs->trans("VariousPayments"));
$i = 0;
$total = 0;
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b31d65fdcaf..8e68945739c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2840,8 +2840,10 @@ if (!empty($conf->projet->enabled)) {
$now = dol_now();
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Card');
-
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewBill");
+}
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $help_url);
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 43897172779..35e49518231 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -100,7 +100,7 @@ if ($action == 'addcontact' && $user->rights->facture->creer) {
* View
*/
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('ContactsAddresses');
+$title = $object->ref." - ".$langs->trans('ContactsAddresses');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 6eb05a16922..aa781610a70 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -100,8 +100,7 @@ if (empty($object->id)) {
exit;
}
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
-
+$title = $object->ref." - ".$langs->trans('Documents');
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $help_url);
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 60efaf36e3d..1c462d60ef2 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -65,7 +65,7 @@ $result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $field
$form = new Form($db);
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Info');
+$title = $object->ref." - ".$langs->trans('Info');
$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $help_url);
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 6f699774d32..199ffce653d 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -85,7 +85,7 @@ if (empty($object->id)) {
exit;
}
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 66561730829..95c298f7244 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -132,31 +132,31 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b
}
$offset = $limit * $page;
-$titre = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
if ($type == "p") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactprospectlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartyProspects").')';
+ $title .= ' ('.$langs->trans("ThirdPartyProspects").')';
$urlfiche = "card.php";
}
if ($type == "c") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactcustomerlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartyCustomers").')';
+ $title .= ' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche = "card.php";
} elseif ($type == "f") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactsupplierlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
+ $title .= ' ('.$langs->trans("ThirdPartySuppliers").')';
$urlfiche = "card.php";
} elseif ($type == "o") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactotherlist';
}
- $titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
+ $title .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
$urlfiche = "";
}
@@ -345,8 +345,6 @@ if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)
$contactstatic->loadCacheOfProspStatus();
}
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-
// Select every potentiels, and note each potentiels which fit in search parameters
$tab_level = array();
$sql = "SELECT code, label, sortorder";
@@ -709,7 +707,7 @@ print '';
print '';
print '';
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
$topicmail = "Information";
$modelmail = "contact";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index accbd84ba8c..b4cac4a82a0 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -211,7 +211,7 @@ function group_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans("GroupCard");
+ $head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'group';
$h++;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 03595b022a5..89678ad95dc 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -803,9 +803,13 @@ if (empty($reshook)) {
* View
*/
+$title = $langs->trans("Shipment");
+if ($action == 'create2') {
+ $title = $langs->trans("CreateShipment");
+}
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
-llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
+llxHeader('', $title, 'Expedition', $help_url);
if (empty($action)) {
$action = 'view';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index bfa48e9aa0f..cea7c59fdc6 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -232,7 +232,7 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db);
}
-$title = $langs->trans('Order')." - ".$langs->trans('Shipments');
+$title = $object->ref." - ".$langs->trans('Shipments');
$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
llxHeader('', $title, $help_url);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 35e5257fce0..f1e02f203e7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1529,7 +1529,10 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db);
}
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewOrderSupplier");
+}
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
llxHeader('', $title, $help_url);
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index e521caf1080..d3477503e4e 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -99,10 +99,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->commande->creer || $
/*
* View
*/
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $title, $help_url);
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
@@ -121,6 +117,10 @@ if ($id > 0 || !empty($ref)) {
if ($object->fetch($id, $ref) > 0) {
$object->fetch_thirdparty();
+ $title = $object->ref." - ".$langs->trans('ContactsAddresses');
+ $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
+ llxHeader('', $title, $help_url);
+
$head = ordersupplier_prepare_head($object);
print dol_get_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order');
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index a1ddef959a0..52f4c37d8a1 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -505,10 +505,11 @@ $formproduct = new FormProduct($db);
$warehouse_static = new Entrepot($db);
$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+$title = $object->ref." - ".$langs->trans('OrderDispatch');
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
$morejs = array('/fourn/js/lib_dispatch.js.php');
-llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, $morejs);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs);
if ($id > 0 || !empty($ref)) {
$soc = new Societe($db);
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index d54d5553efb..64e4d1c8b24 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -98,7 +98,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
llxHeader('', $title, $help_url);
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 6c64672ee84..dfa5d10a2f6 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
$object->info($object->id);
}
-$title = $langs->trans("SupplierOrder").' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
+$title = $object->ref.' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
}
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 1c67c03d727..d32ee8e0641 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -69,7 +69,7 @@ if (empty($reshook)) {
/*
* View
*/
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
llxHeader('', $title, $help_url);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 71c7a4beaf5..654fcce3f60 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1831,7 +1831,10 @@ if (!empty($conf->projet->enabled)) {
$now = dol_now();
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("NewSupplierInvoice");
+}
$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
llxHeader('', $title, $help_url);
@@ -1839,7 +1842,7 @@ llxHeader('', $title, $help_url);
if ($action == 'create') {
$facturestatic = new FactureFournisseur($db);
- print load_fiche_titre($langs->trans('NewBill'), '', 'supplier_invoice');
+ print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
dol_htmloutput_events();
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 927cc5f36b9..a3b4fba9502 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -98,11 +98,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->facture->creer || $u
/*
* View
*/
-
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('ContactsAddresses');
-$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
-llxHeader('', $title, $helpurl);
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
@@ -121,6 +116,10 @@ if ($id > 0 || !empty($ref)) {
$alreadypaid = $object->getSommePaiement();
+ $title = $object->ref." - ".$langs->trans('ContactsAddresses');
+ $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+ llxHeader('', $title, $helpurl);
+
$head = facturefourn_prepare_head($object);
print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 34255541c01..959a1d4020c 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -93,7 +93,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index f17d3c3e127..e9c4d2ea0fa 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -53,18 +53,15 @@ $object = new FactureFournisseur($db);
*/
$form = new Form($db);
-
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Info');
-$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
-llxHeader('', $title, $helpurl);
-
$object->fetch($id, $ref);
$object->fetch_thirdparty();
-
$object->info($object->id);
-
$alreadypaid = $object->getSommePaiement();
+$title = $object->ref." - ".$langs->trans('Info');
+$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+llxHeader('', $title, $helpurl);
+
$head = facturefourn_prepare_head($object);
$titre = $langs->trans('SupplierInvoice');
print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index d59aefe7831..97f4d4562b3 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -83,7 +83,7 @@ if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $use
$form = new Form($db);
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
llxHeader('', $title, $helpurl);
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index ca9ee174d29..cd75cfba57e 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=Vendor invoice
SupplierInvoices=Vendor invoices
ShowSupplierInvoice=Show Vendor Invoice
NewSupplier=New vendor
+NewSupplierInvoice = New vendor invoice
History=History
ListOfSuppliers=List of vendors
ShowSupplier=Show vendor
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 49c70b05641..292d1a59abe 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1022,15 +1022,24 @@ if (!empty($conf->accounting->enabled)) {
$title = $langs->trans('ProductServiceCard');
+
$help_url = '';
$shortlabel = dol_trunc($object->label, 16);
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
- $title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
- $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte';
+ if ($action == 'create') {
+ $title = $langs->trans("NewProduct");
+ } else {
+ $title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
+ $help_url = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos|DE:Modul_Produkte';
+ }
}
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
- $title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
- $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen';
+ if ($action == 'create') {
+ $title = $langs->trans("NewService");
+ } else {
+ $title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
+ $help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Leistungen';
+ }
}
llxHeader('', $title, $help_url);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 942a76585cc..0315922ca28 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -381,16 +381,14 @@ if (empty($reshook)) {
* View
*/
-$title = $langs->trans("ProductsAndServices");
+$title = $langs->trans("ListOfProductsAndServices");
if ($search_type != '' && $search_type != '-1') {
if ($search_type == 1) {
- $texte = $langs->trans("Services");
+ $title = $langs->trans("ListOfServices");
} else {
- $texte = $langs->trans("Products");
+ $title = $langs->trans("ListOfProducts");
}
-} else {
- $texte = $langs->trans("ProductsAndServices");
}
$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,';
@@ -783,7 +781,7 @@ if ($resql) {
$picto = 'service';
}
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
$topicmail = "Information";
$modelmail = "product";
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 8389d63e843..de58f033737 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -279,8 +279,13 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db);
}
+$title = $langs->trans("WarehouseCard");
+if ($action == 'create') {
+ $title = $langs->trans("NewWarehouse");
+}
+
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
-llxHeader("", $langs->trans("WarehouseCard"), $help_url);
+llxHeader("", $title, $help_url);
if ($action == 'create') {
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index f5d74c47c8e..6462115182d 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -630,14 +630,19 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
$i = 0;
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
if ($msid) {
- $texte = $langs->trans('StockMovementForId', $msid);
+ $title = $langs->trans('StockMovementForId', $msid);
} else {
- $texte = $langs->trans("ListOfStockMovements");
+ $title = $langs->trans("ListOfStockMovements");
if ($id) {
- $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+ if (!empty($object->ref)) {
+ $title .= ' ('.$object->ref.')';
+ } else {
+ $title .= ' ('.$langs->trans("ForThisWarehouse").')';
+ }
+
}
}
-llxHeader("", $texte, $help_url);
+llxHeader("", $title, $help_url);
/*
* Show tab only if we ask a particular warehouse
@@ -897,9 +902,9 @@ if ($id > 0) {
}
if ($id > 0) {
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
} else {
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
}
// Add code for pre mass action (confirmation or email presend form)
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index da45abb6168..0e8b5fd4380 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -477,6 +477,7 @@ $title = $langs->trans("Project").' - '.$object->ref.(!empty($object->thirdparty
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
$title = $object->ref.(!empty($object->thirdparty->name) ? ' - '.$object->thirdparty->name : '').(!empty($object->title) ? ' - '.$object->title : '');
}
+
$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos|DE:Modul_Projekte";
llxHeader("", $title, $help_url);
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9e8d3a6ce8e..2b5f38dbf02 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -96,7 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
* View
*/
-$title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name;
+$title = $langs->trans('Documents').' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
}
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index c0afe5d1370..7b8d9528cc3 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -107,8 +107,8 @@ if ($id > 0 || !empty($ref)) {
}
$object->info($object->id);
}
-
-$title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
+$agenda = (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
+$title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
}
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 2ee52d3a247..3eed5e14c60 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -69,7 +69,7 @@ if (empty($reshook)) {
* View
*/
-$title = $langs->trans("Project").' - '.$langs->trans("Note").' - '.$object->ref.' '.$object->name;
+$title = $langs->trans("Notes").' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
}
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 64d134a7254..49943b79434 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -404,10 +404,13 @@ $projectstatic = new Project($db);
$taskstatic = new Task($db);
$userstatic = new User($db);
-$title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
+$title = $langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
}
+if ($action == 'create') {
+ $title = $langs->trans("NewTask");
+}
$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
llxHeader("", $title, $help_url);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 0b26161c28c..962c9853360 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -140,13 +140,19 @@ if (!empty($project_ref) && !empty($withproject)) {
/*
* View
*/
-
-llxHeader('', $langs->trans("Task"));
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
$userstatic = new User($db);
+$result = $projectstatic->fetch($object->fk_project);
+
+$title = $object->ref . ' - ' . $langs->trans("Contacts");
+if (!empty($withproject)) {
+ $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
/* *************************************************************************** */
@@ -162,7 +168,6 @@ if ($id > 0 || !empty($ref)) {
}
$id = $object->id; // So when doing a search from ref, id is also set correctly.
- $result = $projectstatic->fetch($object->fk_project);
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
$projectstatic->fetchComments();
}
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index c57610d0130..77d52fd547f 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -119,10 +119,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
* View
*/
-
$form = new Form($db);
-llxHeader('', $langs->trans('Task'));
+$title = $object->ref . ' - ' . $langs->trans("Documents");
+if (!empty($withproject)) {
+ $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
if ($object->id > 0) {
$projectstatic->fetch_thirdparty();
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 3d1ec610b48..ad6a7c6d03c 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -110,14 +110,19 @@ if (empty($reshook)) {
/*
* View
*/
-
-llxHeader('', $langs->trans("Task"));
-
$form = new Form($db);
$userstatic = new User($db);
$now = dol_now();
+$title = $object->ref . ' - ' . $langs->trans("Notes");
+if (!empty($withproject)) {
+ $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
+
if ($object->id > 0) {
$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index f163af75cae..20cb27eb002 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -191,12 +191,18 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
/*
* View
*/
-
-llxHeader('', $langs->trans("Task"));
-
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
+$result = $projectstatic->fetch($object->fk_project);
+
+$title = $object->ref;
+if (!empty($withproject)) {
+ $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
if ($id > 0 || !empty($ref)) {
$res = $object->fetch_optionals();
@@ -204,7 +210,7 @@ if ($id > 0 || !empty($ref)) {
$object->fetchComments();
}
- $result = $projectstatic->fetch($object->fk_project);
+
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
$projectstatic->fetchComments();
}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ef8ac6aa9df..ef7f98107db 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -699,15 +699,20 @@ if ($action == 'confirm_generateinter') {
/*
* View
*/
-
-$arrayofselected = is_array($toselect) ? $toselect : array();
-
-llxHeader("", $langs->trans("Task"));
-
$form = new Form($db);
$formother = new FormOther($db);
$formproject = new FormProjets($db);
$userstatic = new User($db);
+//$result = $projectstatic->fetch($object->fk_project);
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$title = $object->ref . ' - ' . $langs->trans("TimeSpent");
+if (!empty($withproject)) {
+ $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser > 0) {
/*
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3ef501aeac6..8edf9567c79 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -943,10 +943,12 @@ if ($socid > 0 && empty($object->id)) {
}
$title = $langs->trans("ThirdParty");
+if ($action == 'create') {
+ $title = $langs->trans("NewThirdParty");
+}
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->name." - ".$langs->trans('Card');
}
-
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
llxHeader('', $title, $help_url);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 80b0142a572..a7e6d836218 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -721,7 +721,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
}
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $langs->trans("ThirdParty"), $help_url);
+llxHeader('', $title, $help_url);
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index dedb1ad445d..2d2e9c16ac7 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -681,7 +681,7 @@ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',
$title = $object->name." - ".$langs->trans('PaymentInformation');
}
-llxHeader();
+llxHeader('', $title, $help_url);
$head = societe_prepare_head($object);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 56eef9fb632..9a54edadcd0 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1063,7 +1063,10 @@ if (empty($reshook)) {
/*
* View
*/
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+ $title = $langs->trans("SupplierProposalNew");
+}
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $title, $help_url);
@@ -1082,7 +1085,7 @@ $now = dol_now();
if ($action == 'create') {
$currency_code = $conf->currency;
- print load_fiche_titre($langs->trans("NewAskPrice"), '', 'supplier_proposal');
+ print load_fiche_titre($langs->trans("SupplierProposalNew"), '', 'supplier_proposal');
$soc = new Societe($db);
if ($socid > 0) {
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index f1756f17814..b6a11e9ba17 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -98,10 +98,6 @@ if ($action == 'addcontact' && $permissiontoedit) {
/*
* View
*/
-$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-llxHeader('', $title, $help_url);
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
@@ -120,6 +116,10 @@ if ($id > 0 || !empty($ref)) {
if ($object->fetch($id, $ref) > 0) {
$object->fetch_thirdparty();
+ $title = $object->ref." - ".$langs->trans('ContactsAddresses');
+ $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+ llxHeader('', $title, $help_url);
+
$head = supplier_proposal_prepare_head($object);
print dol_get_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index fa73ec22fa8..ad4050a6eb4 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -90,7 +90,7 @@ if ($object->id > 0) {
* View
*/
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $title, $help_url);
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 0b796937d2e..bda854cba23 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -48,19 +48,16 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
/*
* View
*/
-
$form = new Form($db);
-
-$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);
$object->fetch_thirdparty();
-
$object->info($object->id);
+$title = $object->ref." - ".$langs->trans('Info');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
+
$head = supplier_proposal_prepare_head($object);
print dol_get_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ad35c8f9914..a07272b13df 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -285,8 +285,10 @@ $formpropal = new FormPropal($db);
$companystatic = new Societe($db);
$formcompany = new FormCompany($db);
+$title = $langs->trans('ListOfSupplierProposals');
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-//llxHeader('',$langs->trans('CommRequest'),$help_url);
+
+llxHeader('', $title, $help_url);
$sql = 'SELECT';
if ($sall || $search_product_category > 0 || $search_user > 0) {
@@ -467,7 +469,7 @@ if ($resql) {
exit;
}
- llxHeader('', $langs->trans('CommRequest'), $help_url);
+// llxHeader('', $langs->trans('CommRequest'), $help_url);
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 5a19a94b402..dface2f68c5 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -72,10 +72,6 @@ if (empty($reshook)) {
/*
* View
*/
-$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);
if ($id > 0 || !empty($ref)) {
@@ -88,6 +84,10 @@ if ($id > 0 || !empty($ref)) {
if ($object->fetch($id, $ref)) {
$object->fetch_thirdparty();
+ $title = $object->ref." - ".$langs->trans('Notes');
+ $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+ llxHeader('', $title, $help_url);
+
$societe = new Societe($db);
if ($societe->fetch($object->socid)) {
$head = supplier_proposal_prepare_head($object);
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 5921f7d84cd..09b31e54cd0 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -148,7 +148,11 @@ $formother = new FormOther($db);
$arrayofjs = array();
$arrayofcss = array();
-llxHeader('', $langs->trans("UserSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss);
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('ExtSites');
+$help_url = '';
+
+llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
print '