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

FIX date order was -1D and desc with label repetition

Browse Source
This commit is contained in:
atm-arnaud 2020-03-04 11:58:42 +01:00
parent c80e37edf6
commit 834873ab15
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/actions_massactions.inc.php
View File

@ -658,11 +658,11 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
for ($i=0;$i<$num;$i++) for ($i=0;$i<$num;$i++)
{ {
$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle); $desc=($lines[$i]->desc?$lines[$i]->desc:'');
// If we build one invoice for several order, we must put the invoice of order on the line // If we build one invoice for several order, we must put the invoice of order on the line
if (! empty($createbills_onebythird)) if (! empty($createbills_onebythird))
{ {
$desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day', $langs)); $desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
} }
if ($lines[$i]->subprice < 0) if ($lines[$i]->subprice < 0)

3
htdocs/core/lib/functions.lib.php
View File

@ -1788,6 +1788,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
$format=str_replace('%A', '__A__', $format); $format=str_replace('%A', '__A__', $format);
} }
// Analyze date // Analyze date
$reg=array(); $reg=array();
if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000 if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
@ -1821,6 +1822,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
$ret=adodb_strftime($format, $timetouse, $to_gmt); $ret=adodb_strftime($format, $timetouse, $to_gmt);
} }
else $ret='Bad value '.$time.' for date'; else $ret='Bad value '.$time.' for date';
} }
if (preg_match('/__b__/i', $format)) if (preg_match('/__b__/i', $format))