From cf6be40922922f2ee8e865fc85aa38cfc5f97eae Mon Sep 17 00:00:00 2001 From: aspangaro <alexandre.spangaro@gmail.com> Date: Mon, 11 Jan 2016 22:03:26 +0100 Subject: [PATCH] New: #3292 Make sure each and every page displays a title --- htdocs/accountancy/journal/purchasesjournal.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- htdocs/adherents/stats/byproperties.php | 2 +- htdocs/adherents/stats/geo.php | 2 +- htdocs/comm/contact.php | 9 ++++----- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/langs/en_US/compta.lang | 1 + htdocs/loan/note.php | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 2346df27c77..9faf44e4815 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -375,7 +375,7 @@ if ($action == 'export_csv') } } else { - llxHeader('', '', ''); + llxHeader('', $langs->trans("PurchasesJournal")); $form = new Form($db); diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index d47c2c924c8..33322fd52c4 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -111,7 +111,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both /* * View */ -llxHeader('', $langs->trans("Ventilation")); +llxHeader('', $langs->trans("SuppliersVentilation")); print '<script type="text/javascript"> $(function () { diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index d02ec100322..efcd9e8968e 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -54,7 +54,7 @@ $langs->load("companies"); $memberstatic=new Adherent($db); -llxHeader('','','','',0,0,array('http://www.google.com/jsapi')); +llxHeader('',$langs->trans("MembersStatisticsByProperties"),'','',0,0,array('http://www.google.com/jsapi')); $title=$langs->trans("MembersStatisticsByProperties"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index f8b6a54f7b7..b65ea310115 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -55,7 +55,6 @@ $langs->load("companies"); $arrayjs=array('http://www.google.com/jsapi'); if (! empty($conf->dol_use_jmobile)) $arrayjs=array(); -llxHeader('','','','',0,0,$arrayjs); $title=$langs->trans("Statistics"); if ($mode == 'memberbycountry') $title=$langs->trans("MembersStatisticsByCountries"); @@ -63,6 +62,7 @@ if ($mode == 'memberbystate') $title=$langs->trans("MembersStatisticsByState"); if ($mode == 'memberbytown') $title=$langs->trans("MembersStatisticsByTown"); if ($mode == 'memberbyregion') $title=$langs->trans("MembersStatisticsByRegion"); +llxHeader('', $title,'','',0,0,$arrayjs); print load_fiche_titre($title, $mesg); diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 4a90357ac4a..c7690e7e16f 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -51,10 +51,10 @@ $result = restrictedArea($user, 'societe',$socid,''); /* -* View -*/ + * View + */ -llxHeader('','Contacts'); +llxHeader('',$langs->trans("Contacts")); if ($type == "c" || $type == "p") { @@ -68,8 +68,7 @@ if ($type == "f") } /* - * Mode liste - * + * List mode */ $sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm"; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index b57b0d050d7..b0d7a9bce30 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -126,7 +126,7 @@ if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) { $special_report = true; } -llxHeader('','','','',0,0,'','',$morequerystring); +llxHeader('',$langs->trans("VATReport"),'','',0,0,'','',$morequerystring); $fsearch.='<br>'; $fsearch.=' <input type="hidden" name="year" value="'.$year.'">'; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 8175744a75d..00edf22ac3a 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -104,7 +104,7 @@ foreach($listofparams as $param) if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param); } -llxHeader('','','','',0,0,'','',$morequerystring); +llxHeader('',$langs->trans("VATReport"),'','',0,0,'','',$morequerystring); $form=new Form($db); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index a72a6f61aa3..2b6f73e83bc 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1241,7 +1241,7 @@ $form = new Form($db); $formfile = new FormFile($db); $bankaccountstatic=new Account($db); -llxHeader('','',''); +llxHeader('',$langs->trans('SupplierInvoice'),''); // Mode creation if ($action == 'create') diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index c71b18adc6f..14cacf57022 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -155,6 +155,7 @@ DepositsAreNotIncluded=- Deposit invoices are nor included DepositsAreIncluded=- Deposit invoices are included LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF LT1ReportByCustomersInInputOutputModeES=Report by third party RE +VATReport=VAT report VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index 28f2a0f4918..18b51c86fee 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -56,7 +56,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, $form = new Form($db); -llxHeader('',$langs->trans("LoanArea").' - '.$langs->trans("Notes"),''); +llxHeader('',$langs->trans("LoanArea"),''); if ($id > 0) { -- GitLab