From 688ac691a99911d34184e4c29f45d524b8a29b08 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 31 Aug 2016 07:05:23 +0200
Subject: [PATCH] Uniformize presentation on suppliers invoices
---
htdocs/core/lib/fourn.lib.php | 2 +-
htdocs/fourn/facture/card.php | 6 ++++--
htdocs/fourn/facture/contact.php | 4 +++-
htdocs/fourn/facture/document.php | 4 +++-
htdocs/fourn/facture/info.php | 4 +++-
htdocs/fourn/facture/note.php | 4 +++-
6 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 34a0df45674..4c277a69968 100644
--- 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
index 84b0a24a75a..7f7cbdf44eb 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1113,7 +1113,9 @@ $formfile = new FormFile($db);
$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 @@ else
$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
index fbcb907ec74..1da6e0699fc 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -112,7 +112,9 @@ else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->cree
* 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
index 97e84d0cb6e..3ca1c2d05fa 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -81,7 +81,9 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$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
index 4dad6ea7f86..590d5ea75bd 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -43,7 +43,9 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
* 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
index 1b8a4cd6bbc..eeb9d37f2fd 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -67,7 +67,9 @@ if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
$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)
{
--
GitLab