From f686ef1d045024e34693f046d2118e6f4525d03d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Mar 2016 15:50:35 +0100 Subject: [PATCH] Uniformize look --- htdocs/compta/localtax/index.php | 32 ++++++++++++++++++-------------- htdocs/compta/tva/index.php | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 3bed627402e..887c3698af5 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -27,10 +27,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("other"); +$langs->load("compta"); +$langs->load("banks"); +$langs->load("bills"); + $localTaxType=GETPOST('localTaxType', 'int'); -$year=$_GET["year"]; -if ($year == 0 ) { +$year=GETPOST("year","int"); +if ($year == 0) +{ $year_current = strftime("%Y",time()); $year_start = $year_current; } else { @@ -122,25 +127,24 @@ if($localTaxType==1) { $textprevyear="".img_previous().""; $textnextyear=" ".img_next().""; -print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear"); +print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear", 'title_accountancy.png'); print $langs->trans("LTReportBuildWithOptionDefinedInModule").'
'; print '('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')
'; print '
'; -print ''; -print '
'; -print load_fiche_titre($langs->transcountry($LTSummary,$mysoc->country_code)); - -print ' '; -print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code)); +print ''; +print ''; -print '
'; +print load_fiche_titre($langs->transcountry($LTSummary,$mysoc->country_code), '', ''); +print ' '; +print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code), '', ''); print '
'; +print '
'; -print ""; -print ""; -print ""; +print '
".$langs->trans("Year")." $y
'; +print ''; +print '"; if($CalcLT==0) { print ""; print ""; @@ -271,7 +275,7 @@ $sql.= " WHERE f.entity = ".$conf->entity; $sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'"; $sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'"; $sql.= " AND localtaxtype=".$localTaxType; -$sql.= " GROUP BY dm ASC"; +$sql.= " GROUP BY dm ASC ORDER BY dm ASC"; pt($db, $sql,$langs->trans("Year")." $y"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index dc2be67e44f..c49b24102cb 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -56,7 +56,7 @@ if (isset($_GET["modetax"])) $modetax=$_GET["modetax"]; /** - * pt + * print function * * @param DoliDB $db Database handler * @param string $sql SQL Request
'.$langs->trans("Year")." ".$y."".$langs->transcountry($LTCustomer,$mysoc->country_code)."".$langs->transcountry($LTSupplier,$mysoc->country_code)."