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

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
This commit is contained in:
Laurent Destailleur
2021-01-24 15:29:53 +01:00
parent 005292054d 8bbf6ce577
commit 0f5fc7353e
18 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/modulebuilder/template/admin/setup.php
View File

@@ -83,10 +83,9 @@ if ($action == 'updateMask') {
if ($maskconstorder) {
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
}
if (!($res > 0)) {
$error++;
if (!($res > 0)) {
$error++;
}
}
if (!$error) {