From 7eb48a3f9ce8ff8ff452dfcef059c1bb16c7f22e Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sat, 3 Aug 2019 06:04:42 +0200 Subject: [PATCH] Fix month of the fiscal year start min 1 max 12 / january = 1 --- .../boxes/box_graph_invoices_permonth.php | 8 ++--- .../box_graph_invoices_supplier_permonth.php | 8 ++--- .../core/boxes/box_graph_orders_permonth.php | 8 ++--- .../box_graph_orders_supplier_permonth.php | 8 ++--- .../boxes/box_graph_propales_permonth.php | 8 ++--- htdocs/core/class/stats.class.php | 35 +++++++++---------- 6 files changed, 37 insertions(+), 38 deletions(-) diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php index d33600c0fc8..6e5afe5df99 100644 --- a/htdocs/core/boxes/box_graph_invoices_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_permonth.php @@ -74,8 +74,8 @@ class box_graph_invoices_permonth extends ModeleBoxes //include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; //$facturestatic=new Facture($db); - $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 0; + $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1; + if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1; $text = $langs->trans("BoxCustomersInvoicesPerMonth", $max); $this->info_box_head = array( @@ -149,7 +149,7 @@ class box_graph_invoices_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } @@ -194,7 +194,7 @@ class box_graph_invoices_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php index d01d5b6252f..df4f4afc146 100644 --- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php @@ -73,8 +73,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; - $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 0; + $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1; + if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1; $text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max); $this->info_box_head = array( @@ -146,7 +146,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } @@ -191,7 +191,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php index f9be1c79cea..b530b4ea268 100644 --- a/htdocs/core/boxes/box_graph_orders_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_permonth.php @@ -74,8 +74,8 @@ class box_graph_orders_permonth extends ModeleBoxes //include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; //$commandestatic=new Commande($db); - $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 0; + $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1; + if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1; $text = $langs->trans("BoxCustomersOrdersPerMonth", $max); $this->info_box_head = array( @@ -147,7 +147,7 @@ class box_graph_orders_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } @@ -190,7 +190,7 @@ class box_graph_orders_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php index 1f907fc01be..8359ddbe070 100644 --- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -73,8 +73,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; - $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 0; + $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1; + if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1; $text = $langs->trans("BoxSuppliersOrdersPerMonth", $max); $this->info_box_head = array( @@ -146,7 +146,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } @@ -189,7 +189,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php index 78cbadc6fb2..75673ee3fce 100644 --- a/htdocs/core/boxes/box_graph_propales_permonth.php +++ b/htdocs/core/boxes/box_graph_propales_permonth.php @@ -74,8 +74,8 @@ class box_graph_propales_permonth extends ModeleBoxes //include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; //$propalstatic=new Propal($db); - $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 0; + $startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1; + if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1; $langs->load("propal"); @@ -147,7 +147,7 @@ class box_graph_propales_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } @@ -193,7 +193,7 @@ class box_graph_propales_permonth extends ModeleBoxes $i=$startyear;$legend=array(); while ($i <= $endyear) { - if ($startmonth != 0) + if ($startmonth != 1) { $legend[]=sprintf("%d/%d", $i-2001, $i-2000); } diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index 85a6f43ed4d..8df81bd4495 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.class.php @@ -40,11 +40,11 @@ abstract class Stats * @param int $startyear End year * @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save) * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month - * @param int $startmonth month of the fiscal year start min 1 max 12 ; if 0 = january + * @param int $startmonth month of the fiscal year start min 1 max 12 ; if 1 = january * @return array Array of values */ - public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 0) + public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1) { global $conf,$user,$langs; @@ -88,10 +88,8 @@ abstract class Stats else { $year=$startyear; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) { - $startmonth = 0; - } - if ($startmonth != 0) $year = $year - 1; + $sm = $startmonth - 1; + if ($sm != 0) $year = $year - 1; while ($year <= $endyear) { $datay[$year] = $this->getNbByMonth($year, $format); @@ -102,11 +100,11 @@ abstract class Stats for ($i = 0 ; $i < 12 ; $i++) { - $data[$i][]=$datay[$endyear][($i+$startmonth)%12][0]; + $data[$i][]=$datay[$endyear][($i+$sm)%12][0]; $year=$startyear; while($year <= $endyear) { - $data[$i][]=$datay[$year - (1 - ((int) ($i+$startmonth)/12) + ($startmonth == 0 ? 1 : 0))][($i+$startmonth)%12][1]; + $data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1]; $year++; } } @@ -140,10 +138,10 @@ abstract class Stats * @param int $startyear End year * @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save) * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month - * @param int $startmonth month of the fiscal year start min 1 max 12 ; if 0 = january + * @param int $startmonth month of the fiscal year start min 1 max 12 ; if 1 = january * @return array Array of values */ - public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 0) + public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1) { global $conf,$user,$langs; @@ -188,10 +186,8 @@ abstract class Stats else { $year=$startyear; - if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) { - $startmonth = 0; - } - if ($startmonth != 0) $year = $year - 1; + $sm = $startmonth - 1; + if ($sm != 0) $year = $year - 1; while($year <= $endyear) { $datay[$year] = $this->getAmountByMonth($year, $format); @@ -202,11 +198,11 @@ abstract class Stats // $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...) for ($i = 0 ; $i < 12 ; $i++) { - $data[$i][]=$datay[$endyear][($i+$startmonth)%12][0]; // set label + $data[$i][]=$datay[$endyear][($i+$sm)%12][0]; // set label $year=$startyear; while($year <= $endyear) { - $data[$i][]=$datay[$year - (1 - ((int) ($i+$startmonth)/12) + ($startmonth == 0 ? 1 : 0))][($i+$startmonth)%12][1]; // set yval for x=i + $data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1]; // set yval for x=i $year++; } } @@ -422,7 +418,8 @@ abstract class Stats // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore /** - * Renvoie le nombre de proposition par mois pour une annee donnee + * Renvoie le nombre de documents par mois pour une annee donnee + * Return number of documents per month for a given year * * @param int $year Year * @param string $sql SQL @@ -481,7 +478,8 @@ abstract class Stats // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore /** - * Renvoie le nombre d'element par mois pour une annee donnee + * Renvoie le montant totalise par mois pour une annee donnee + * Return the amount per month for a given year * * @param int $year Year * @param string $sql SQL @@ -538,6 +536,7 @@ abstract class Stats // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore /** * Renvoie le montant moyen par mois pour une annee donnee + * Return the amount average par month for a given year * * @param int $year Year * @param string $sql SQL