Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/lib/functions.lib.php
This commit is contained in:
Laurent Destailleur
2020-02-29 12:51:33 +01:00
parent 8eff3162a9 c3ab1055bf
commit 0855598c00
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/journal/bankjournal.php
View File

@@ -760,7 +760,7 @@ if (! $error && $action == 'writebookkeeping') {
} }
} }
if (price2num($totaldebit) != price2num($totalcredit)) if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))
{ {
$error++; $error++;
$errorforline++; $errorforline++;

2
htdocs/accountancy/journal/expensereportsjournal.php
View File

@@ -355,7 +355,7 @@ if ($action == 'writebookkeeping') {
} }
// Protection against a bug on line before // Protection against a bug on line before
if (price2num($totaldebit) != price2num($totalcredit)) if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))
{ {
$error++; $error++;
$errorforline++; $errorforline++;

2
htdocs/accountancy/journal/purchasesjournal.php
View File

@@ -513,7 +513,7 @@ if ($action == 'writebookkeeping') {
} }
// Protection against a bug on lines before // Protection against a bug on lines before
if (!$errorforline && (price2num($totaldebit) != price2num($totalcredit))) if (! $errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')))
{ {
$error++; $error++;
$errorforline++; $errorforline++;

2
htdocs/accountancy/journal/sellsjournal.php
View File

@@ -471,7 +471,7 @@ if ($action == 'writebookkeeping') {
} }
// Protection against a bug on lines before // Protection against a bug on lines before
if (!$errorforline && (price2num($totaldebit) != price2num($totalcredit))) if (! $errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')))
{ {
$error++; $error++;
$errorforline++; $errorforline++;

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

@@ -7804,12 +7804,11 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
} }
else // $mode=0 else // $mode=0
{ {
$textcrit = '';
$tmpcrits = explode('|', $crit); $tmpcrits = explode('|', $crit);
$i3 = 0; $i3 = 0;
foreach ($tmpcrits as $tmpcrit) foreach ($tmpcrits as $tmpcrit)
{ {
if (empty($tmpcrit)) continue; if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : ''); $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');