From 72e2567fa496efda297150cd0a2409bd3e82299a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 10 Jan 2011 22:36:34 +0000 Subject: [PATCH] Fix: Removed deprecated text in reports --- htdocs/compta/resultat/clientfourn.php | 6 +++--- htdocs/compta/resultat/index.php | 4 ++-- htdocs/compta/stats/cabyuser.php | 6 +++--- htdocs/compta/stats/casoc.php | 6 +++--- htdocs/compta/stats/index.php | 6 +++--- htdocs/compta/tva/clients.php | 4 ++-- htdocs/compta/tva/quadri_detail.php | 4 ++-- htdocs/lib/report.lib.php | 20 ++++++++++---------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 6c2b95b06a4..8739d0aafad 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -66,7 +66,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($month_start > $month_current) { $year_start--; - $year_end--; + $year_end--; } $month_end=$month_start-1; if ($month_end < 1) $month_end=12; @@ -107,7 +107,7 @@ if ($modecompta=="CREANCES-DETTES") //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultDue"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } else { $nom=$langs->trans("AnnualByCompaniesInputOutputMode"); @@ -117,7 +117,7 @@ else { //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultInOut"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 92af92ae595..652226c1b3f 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -68,7 +68,7 @@ if ($modecompta=="CREANCES-DETTES") $periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesResultDue"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } else { $nom=$langs->trans("AnnualSummaryInputOutputMode"); @@ -77,7 +77,7 @@ else { $periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesResultInOut"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 6ce8f806535..bbab0460c3f 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -74,7 +74,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($month_start > $month_current) { $year_start--; - $year_end--; + $year_end--; } $month_end=$month_start-1; if ($month_end < 1) $month_end=12; @@ -112,7 +112,7 @@ if ($modecompta=="CREANCES-DETTES") //$periodlink="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCADue"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } else { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice"); @@ -121,7 +121,7 @@ else { //$periodlink="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCAIn"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink); diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index b4ca1a3d78d..92a7ac1295b 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -77,7 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($month_start > $month_current) { $year_start--; - $year_end--; + $year_end--; } $month_end=$month_start-1; if ($month_end < 1) $month_end=12; @@ -115,7 +115,7 @@ if ($modecompta=="CREANCES-DETTES") //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCADue"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } else { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties"); @@ -124,7 +124,7 @@ else { //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCAIn"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index ffae9d85994..52b01a4c900 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -65,7 +65,7 @@ if ($modecompta=="CREANCES-DETTES") $periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesCADue"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } else { $nom=$langs->trans("SalesTurnover"); @@ -74,7 +74,7 @@ else { $periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesCAIn"); $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); } report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink); @@ -343,7 +343,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) } // Pourcentage total - if ($annee > $minyear && $annee <= max($nowyear,$maxyear)) + if ($annee > $minyear && $annee <= max($nowyear,$maxyear)) { if ($total[$annee-1] && $total[$annee]) { $percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 5398ba257aa..7c15b3fa2c8 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -113,7 +113,7 @@ if ($modetax==1) // Calculate on invoice for goods and services $description.=$fsearch; $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("Description"); @@ -135,7 +135,7 @@ if ($modetax==0) // Invoice for goods, payment for services $description.=$fsearch; $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("Description"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 056f1e2c54d..ed2cee697c4 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -131,7 +131,7 @@ if ($modetax==1) // Calculate on invoice for goods and services //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); $description.=$fsearch; $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("ProductOrService"); @@ -160,7 +160,7 @@ if ($modetax==0) // Invoice for goods, payment for services $description.=$fsearch; $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; $builddate=time(); - $exportlink=$langs->trans("NotYetAvailable"); + //$exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("ProductOrService"); diff --git a/htdocs/lib/report.lib.php b/htdocs/lib/report.lib.php index 6dafee9768b..e1f73204ab2 100644 --- a/htdocs/lib/report.lib.php +++ b/htdocs/lib/report.lib.php @@ -25,16 +25,16 @@ /** -* \brief Show header of a VAT report -* \param nom Name of report -* \param variante Link for alternate report -* \param period Period of report -* \param periodlink Link to switch period -* \param description Description -* \param builddate Date generation -* \param exportlink Link for export +* Show header of a VAT report +* @param nom Name of report +* @param variante Link for alternate report +* @param period Period of report +* @param periodlink Link to switch period +* @param description Description +* @param builddate Date generation +* @param exportlink Link for export or '' */ -function report_header($nom,$variante='',$period,$periodlink,$description,$builddate,$exportlink) +function report_header($nom,$variante='',$period,$periodlink,$description,$builddate,$exportlink='') { global $langs; @@ -84,7 +84,7 @@ function report_header($nom,$variante='',$period,$periodlink,$description,$build print ''; print ''; - print ''; + print ''; print ''; print '';