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

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

Browse Source 
Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
This commit is contained in:
Laurent Destailleur 2019-09-27 14:07:11 +02:00
commit 6d1a571aed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement_charge.php
View File

@ -71,7 +71,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm=='yes
$error++;
$action = 'create';
}
if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0)
if (! empty($conf->banque->enabled) && ! ($_POST["accountid"] > 0))
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
$error++;

2
htdocs/expedition/card.php
View File

@ -551,6 +551,7 @@ if (empty($reshook))
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
exit();
}
setEventMessages($object->error, $object->errors, 'errors');
}
elseif ($action == 'classifyclosed')
@ -561,6 +562,7 @@ if (empty($reshook))
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
exit();
}
setEventMessages($object->error, $object->errors, 'errors');
}
/*