Merge pull request #5684 from aspangaro/5.0-p9

Uniformize presentation on suppliers invoices
Dolibarr · Aug 31, 2016 · 90c670a · 90c670a
2 parents 966c1f6 + 688ac69
commit 90c670a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
@@ -39,7 +39,7 @@ function facturefourn_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('CardBill');
+	$head[$h][1] = $langs->trans('Card');
 	$head[$h][2] = 'card';
 	$h++;
 

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
@@ -1113,7 +1113,9 @@
 $bankaccountstatic=new Account($db);
 $paymentstatic=new PaiementFourn($db);
 
-llxHeader('',$langs->trans('SupplierInvoice'),'');
+$title = $langs->trans('SupplierInvoice') . " - " . $langs->trans('Card');
+$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+llxHeader('', $title, $helpurl);
 
 // Mode creation
 if ($action == 'create')
@@ -1827,7 +1829,7 @@
 	    $form_permission = $object->statut<FactureFournisseur::STATUS_CLOSED && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0;
 
         // Date
-        print '<tr><td>'.$form->editfieldkey("Date",'datef',$object->datep,$object,$form_permission,'datepicker').'</td><td colspan="3">';
+        print '<tr><td>'.$form->editfieldkey("DateInvoice",'datef',$object->datep,$object,$form_permission,'datepicker').'</td><td colspan="3">';
         print $form->editfieldval("Date",'datef',$object->datep,$object,$form_permission,'datepicker');
         print '</td>';
 

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
@@ -112,7 +112,9 @@
  * View
  */
 
-llxHeader('',$langs->trans('SupplierInvoice'));
+$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);

diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
@@ -81,7 +81,9 @@
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans('SupplierInvoice'));
+$title = $langs->trans('SupplierInvoice') . " - " . $langs->trans('Documents');
+$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+llxHeader('', $title, $helpurl);
 
 if ($object->id > 0)
 {

diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
@@ -43,7 +43,9 @@
  * View
  */
 
-llxHeader('',$langs->trans('SupplierInvoice'));
+$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 = new FactureFournisseur($db);
 $object->fetch($id);

diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
@@ -67,7 +67,9 @@
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans('SupplierInvoice'));
+$title = $langs->trans('SupplierInvoice') . " - " . $langs->trans('Notes');
+$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+llxHeader('', $title, $helpurl);
 
 if ($object->id > 0)
 {