lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: on ne prend pas en compte le mois de janvier pour le debut d'anne fiscale car il est pris par defaut

Browse Source
This commit is contained in:
Regis Houssin 2007-05-28 19:47:21 +00:00
parent eebc13dd9a
commit c4745e1a81
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/commande/modules/mod_commande_fournisseur_orchidee.php
View File

@ -352,7 +352,7 @@ function info()
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }

2
htdocs/includes/modules/commande/mod_commande_emeraude.php
View File

@ -90,7 +90,7 @@ class mod_commande_emeraude extends ModeleNumRefCommandes
// D'abord on défini l'année fiscale // D'abord on défini l'année fiscale
$prefix='C'; $prefix='C';
$current_month = date("n"); $current_month = date("n");
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/commande/mod_commande_rubis.php
View File

@ -90,7 +90,7 @@ class mod_commande_rubis extends ModeleNumRefCommandes
// D'abord on défini l'année fiscale // D'abord on défini l'année fiscale
$prefix='C'; $prefix='C';
$current_month = date("n"); $current_month = date("n");
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/commande/mod_commande_saphir.php
View File

@ -354,7 +354,7 @@ function info()
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }

2
htdocs/includes/modules/facture/orion/orion.modules.php
View File

@ -93,7 +93,7 @@ function info()
$create_month = $current_month; $create_month = $current_month;
} }
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/facture/pluton/pluton.modules.php
View File

@ -398,7 +398,7 @@ function info()
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }

2
htdocs/includes/modules/facture/titan/titan.modules.php
View File

@ -94,7 +94,7 @@ function info()
$create_month = $current_month; $create_month = $current_month;
} }
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/fichinter/mod_arctic.php
View File

@ -354,7 +354,7 @@ function info()
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }

2
htdocs/includes/modules/propale/mod_propale_emeraude.php
View File

@ -89,7 +89,7 @@ class mod_propale_emeraude extends ModeleNumRefPropales
// D'abord on défini l'année fiscale // D'abord on défini l'année fiscale
$prefix='PR'; $prefix='PR';
$current_month = date("n"); $current_month = date("n");
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/propale/mod_propale_rubis.php
View File

@ -89,7 +89,7 @@ class mod_propale_rubis extends ModeleNumRefPropales
// D'abord on défini l'année fiscale // D'abord on défini l'année fiscale
$prefix='PR'; $prefix='PR';
$current_month = date("n"); $current_month = date("n");
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
} }

2
htdocs/includes/modules/propale/mod_propale_saphir.php
View File

@ -343,7 +343,7 @@ function info()
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }

2
htdocs/livraison/mods/mod_livraison_saphir.php
View File

@ -356,7 +356,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
} }
// On change d'année fiscal si besoin // On change d'année fiscal si besoin
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
{ {
$this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear);
} }