diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f9c02522a87..c2dbb5996a7 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1887,7 +1887,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
$now = dol_now();
-llxHeader('', $langs->trans('Bill'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
+llxHeader('', $langs->trans('InvoiceCustomer'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
// Mode creation
@@ -2931,7 +2931,7 @@ else if ($id > 0 || ! empty($ref))
$linkback = '' . $langs->trans("BackToList") . '';
// Ref
- print '
';
print '| ';
print $langs->trans('RefCustomer');
print ' | ';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c5a7cfcdab2..a7fa51ff5ae 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -114,7 +114,7 @@ else if ($action == 'deletecontact' && $user->rights->facture->creer)
* View
*/
-llxHeader('', $langs->trans("Bill"), "Facture");
+llxHeader('', $langs->trans("InvoiceCustomer"));
$form = new Form($db);
$formcompany = new FormCompany($db);
@@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref))
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print ' | '.$langs->trans('Ref').' | ';
+ print ' | '.$langs->trans('Ref').' | ';
print '';
$morehtmlref='';
$discount=new DiscountAbsolute($db);
@@ -163,13 +163,10 @@ if ($id > 0 || ! empty($ref))
print ' | ';
// Ref customer
- print '';
- print '| ';
+ print ' | | ';
print $langs->trans('RefCustomer');
print ' | ';
- print ' ';
- print ' | ';
- print '';
+ print ' | ';
print $object->ref_client;
print ' | ';
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 9a2bf3fe433..b25d52c173b 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -82,7 +82,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
* View
*/
-llxHeader();
+llxHeader('', $langs->trans("InvoiceCustomer"));
$form = new Form($db);
@@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref))
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans('Ref').' | ';
+ print ' | '.$langs->trans('Ref').' | ';
print '';
$morehtmlref='';
$discount=new DiscountAbsolute($db);
@@ -130,13 +130,10 @@ if ($id > 0 || ! empty($ref))
print ' | ';
// Ref customer
- print '';
- print '| ';
+ print ' | | ';
print $langs->trans('RefCustomer');
print ' | ';
- print ' ';
- print ' | ';
- print '';
+ print ' | ';
print $object->ref_client;
print ' | ';
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 24164b5709a..250848319f3 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -35,7 +35,7 @@ $langs->load("bills");
* View
*/
-llxHeader();
+llxHeader('', $langs->trans("InvoiceCustomer"));
$fac = new Facture($db);
$fac->fetch($_GET["facid"]);
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 3562a235963..77d3817d911 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -60,7 +60,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
* View
*/
-llxHeader();
+llxHeader('', $langs->trans("InvoiceCustomer"));
$form = new Form($db);
@@ -81,7 +81,7 @@ if ($id > 0 || ! empty($ref))
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans('Ref').' | ';
+ print ' | '.$langs->trans('Ref').' | ';
print '';
$morehtmlref='';
$discount=new DiscountAbsolute($db);
@@ -98,13 +98,10 @@ if ($id > 0 || ! empty($ref))
print ' | ';
// Ref customer
- print '';
- print '| ';
+ print ' | | ';
print $langs->trans('RefCustomer');
print ' | ';
- print ' ';
- print ' | ';
- print '';
+ print ' | ';
print $object->ref_client;
print ' | ';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 73c8a208295..74a41dee31c 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -106,7 +106,7 @@ if ($action == "delete")
$now=dol_now();
-llxHeader('', $langs->trans("Bill"));
+llxHeader('', $langs->trans("InvoiceCustomer"));
$form = new Form($db);
@@ -155,7 +155,7 @@ if ($object->id > 0)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
$morehtmlref='';
$discount=new DiscountAbsolute($db);
$result=$discount->fetch(0,$object->id);
@@ -171,24 +171,24 @@ if ($object->id > 0)
print " | ";
// Ref customer
- print '| ';
+ print ' | ';
print '| ';
print $langs->trans('RefCustomer');
print ' | ';
print ' ';
print ' | ';
- print '';
+ print ' | ';
print $object->ref_client;
print ' | ';
// Third party
print '| '.$langs->trans('Company').' | ';
- print ''.$object->thirdparty->getNomUrl(1,'compta');
+ print ' | '.$object->thirdparty->getNomUrl(1,'compta');
print ' ('.$langs->trans('OtherBills').') | ';
print ' ';
// Type
- print '| '.$langs->trans('Type').' | ';
+ print ' | | '.$langs->trans('Type').' | ';
print $object->getLibType();
if ($object->type == Facture::TYPE_REPLACEMENT)
{
@@ -229,7 +229,7 @@ if ($object->id > 0)
print ' | ';
// Discounts
- print '| '.$langs->trans('Discounts').' | ';
+ print ' | | '.$langs->trans('Discounts').' | ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
else print $langs->trans("CompanyHasNoRelativeDiscount");
print '. ';
@@ -443,7 +443,7 @@ if ($object->id > 0)
print ' | | '.$langs->trans('Status').' | ';
print ''.($object->getLibStatut(4,$totalpaye)).' | ';
- print '| '.$langs->trans("RIB").' | ';
+ print ' | | '.$langs->trans("RIB").' | ';
print $object->thirdparty->display_rib();
print ' | ';
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 4a8dc21ca1b..f39fd0780ad 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,8 +1,8 @@
+/* Copyright (C) 2011-2016 Alexandre Spangaro
* Copyright (C) 2014 Laurent Destailleur
* Copyright (C) 2015 Jean-François Ferry
- * Copyright (C) 2015 Charlie BENKE
+ * Copyright (C) 2015 Charlie BENKE
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -187,7 +187,7 @@ if ($action == 'delete')
* View
*/
-llxHeader();
+llxHeader("",$langs->trans("SalaryPayment"));
$form = new Form($db);
@@ -339,7 +339,7 @@ if ($id)
$linkback = ''.$langs->trans("BackToList").'';
print "";
- print '| '.$langs->trans("Ref").' | ';
+ print ' | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
print ' | ';
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 7f0bf49dc6d..9e48533846a 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005 Simon TOSSER
* Copyright (C) 2011-2012 Juanjo Menent
* Copyright (C) 2013 Cédric Salvador
- * Copyright (C) 2015 Alexandre Spangaro
+ * Copyright (C) 2015-2016 Alexandre Spangaro
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-llxHeader("","",$langs->trans("SalaryPayment"));
+llxHeader("",$langs->trans("SalaryPayment"));
if ($object->id)
@@ -107,7 +107,7 @@ if ($object->id)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
print ' | ';
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index cbc0c1742ff..429efc27a33 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -44,9 +44,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
* View
*/
-$help_url='EN:Module_Salaries|FR:Module Fiche de paie|ES:Módulo Salarios';
-llxHeader("",$langs->trans("Salaries"),$help_url);
-
+llxHeader("",$langs->trans("SalaryPayment"));
$salpayment = new PaymentSalary($db);
$result = $salpayment->fetch($id);
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index e66eed3da05..d6b810c5789 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -283,7 +283,7 @@ if ($action == 'builddoc')
* View
*/
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones');
+llxHeader('',$langs->trans("Donation"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones');
$form=new Form($db);
$formfile = new FormFile($db);
@@ -424,7 +424,7 @@ if (! empty($id) && $action == 'edit')
print '';
// Ref
- print "".'| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $object->getNomUrl();
print ' | ';
print ' ';
@@ -554,13 +554,13 @@ if (! empty($id) && $action != 'edit')
if (! empty($conf->projet->enabled)) $nbrows++;
// Ref
- print "".'| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'rowid', $linkback, 1, 'rowid', 'ref', '');
print ' | ';
print ' ';
// Date
- print '| '.$langs->trans("Date").' | ';
+ print ' | | '.$langs->trans("Date").' | ';
print dol_print_date($object->date,"day");
print " | ";
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 706eb4b70f7..4992e5dbbc8 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-llxHeader("","",$langs->trans("Donations"));
+llxHeader("",$langs->trans("Donation"));
if ($object->id)
@@ -107,7 +107,7 @@ if ($object->id)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print ' | '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
print ' | ';
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 1c51a1fa9f8..6e7bce98b4c 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -38,7 +38,7 @@ $result = restrictedArea($user, 'don', $id, '');
* View
*/
-llxHeader();
+llxHeader("",$langs->trans("Donation"));
if ($id)
{
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 249a85f4ef2..dd9a28a130c 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-llxHeader("","",$langs->trans("TripCard"));
+llxHeader("",$langs->trans("ExpenseReport"));
if ($object->id)
@@ -107,7 +107,7 @@ if ($object->id)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
print ' | ';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1e8e05d81e5..50ec61f10f5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1656,7 +1656,7 @@ else
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
print ' | ';
print " \n";
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 664101848a6..fbcb907ec74 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -112,7 +112,7 @@ else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->cree
* View
*/
-llxHeader('', $langs->trans("Bill"), "Facture");
+llxHeader('',$langs->trans('SupplierInvoice'));
$form = new Form($db);
$formcompany = new FormCompany($db);
@@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref))
$linkback = ''.$langs->trans("BackToList").'';
// Reference du facture
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
print " | ";
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 673d679b4b5..97e84d0cb6e 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form = new Form($db);
-llxHeader();
+llxHeader('',$langs->trans('SupplierInvoice'));
if ($object->id > 0)
{
@@ -110,7 +110,7 @@ if ($object->id > 0)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
print ' | ';
print " \n";
@@ -197,7 +197,7 @@ if ($object->id > 0)
print '';
// Nb of files
- print '| '.$langs->trans('NbOfAttachedFiles').' | '.count($filearray).' | ';
+ print '| '.$langs->trans('NbOfAttachedFiles').' | '.count($filearray).' | ';
print '| '.$langs->trans('TotalSizeOfAttachedFiles').' | '.$totalsize.' '.$langs->trans('bytes').' | ';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 7033d555c0e..4dad6ea7f86 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -43,7 +43,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
* View
*/
-llxHeader();
+llxHeader('',$langs->trans('SupplierInvoice'));
$object = new FactureFournisseur($db);
$object->fetch($id);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 3a4528d827e..1b8a4cd6bbc 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -67,7 +67,7 @@ if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
$form = new Form($db);
-llxHeader();
+llxHeader('',$langs->trans('SupplierInvoice'));
if ($object->id > 0)
{
@@ -83,7 +83,7 @@ if ($object->id > 0)
$linkback = ''.$langs->trans("BackToList").'';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | | '.$langs->trans("Ref").' | ';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
print ' | ';
print " \n";
@@ -167,7 +167,6 @@ if ($object->id > 0)
print ' ';
- $colwidth=20;
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
dol_fiche_end();
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 9b3494c762f..4c6aeb99110 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -794,7 +794,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
// User
print '';
- print '| '.$langs->trans("User").' | ';
+ print ''.$langs->trans("User").' | ';
print '';
if (empty($user->rights->holiday->write_all))
{
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 54b49de9ec3..bb8ffeb6b4f 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -702,6 +702,7 @@ RelatedObjects=Related Objects
ClassifyBilled=Classify billed
Progress=Progress
ClickHere=Click here
+View=View
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index a92fa7aad25..548f81c82dd 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -247,7 +247,7 @@ if ($socid && $action != 'edit' && $action != "create")
print '';
print '';
- print '| '.$langs->trans("LabelRIB").' | ';
+ print ' | '.$langs->trans("LabelRIB").' | ';
print ''.$account->label.' | ';
print '| '.$langs->trans("BankName").' | ';
@@ -424,7 +424,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
print '';
print ' |
|