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

Fix: update doc

Browse Source
This commit is contained in:
Regis Houssin 2012-09-22 09:03:38 +02:00
parent d48f494eb0
commit eee4434850
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/functions2.lib.php
View File

@ -589,7 +589,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
// Define $sqlwhere // Define $sqlwhere
$sqlwhere=''; $sqlwhere='';
$yearoffset=0; // Use year of date by default $yearoffset=0; // Use year of current $date by default
$yearoffsettype=false; $yearoffsettype=false;
// If a restore to zero after a month is asked we check if there is already a value for this year. // If a restore to zero after a month is asked we check if there is already a value for this year.
@ -627,18 +627,17 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$monthcomp=$maskraz; $monthcomp=$maskraz;
$yearcomp=0; $yearcomp=0;
if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype)) { if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype))
{
$currentyear=date("Y", $date); $currentyear=date("Y", $date);
$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear); $fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
$newyeardate=dol_mktime('0','0','0','1','1',$currentyear); $newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1); $nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>'; //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
if ($date >= $fiscaldate) // If after or equal current fiscal date if ($date >= $fiscaldate) // If after or equal current fiscal date
{ {
if ($date < $nextnewyeardate) // If after or equal of next new year date if ($date < $nextnewyeardate) // If before of next new year date
{ {
if ($yearoffsettype == '-') $yearoffset=0; if ($yearoffsettype == '-') $yearoffset=0;
else if ($yearoffsettype == '+') $yearoffset=1; else if ($yearoffsettype == '+') $yearoffset=1;
@ -650,6 +649,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
else if ($yearoffsettype == '+') $yearoffset=0; else if ($yearoffsettype == '+') $yearoffset=0;
} }
} }
// For backward compatibility
else if (date("m",$date) < $maskraz) { $yearoffset=-1; } // If current month lower that month of return to zero, year is previous year else if (date("m",$date) < $maskraz) { $yearoffset=-1; } // If current month lower that month of return to zero, year is previous year
if (dol_strlen($reg[$posy]) == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset); if (dol_strlen($reg[$posy]) == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);