Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
This commit is contained in:
Laurent Destailleur
2021-12-30 17:57:45 +01:00
parent 63f2cd6a30 9f82aa1570
commit 62a74ed428
7 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,11 +100,11 @@ if ((float) DOL_VERSION >= 6) {
}
if ($action == 'updateMask') {
$maskconstorder = GETPOST('maskconstorder', 'alpha');
$maskorder = GETPOST('maskorder', 'alpha');
$maskconst = GETPOST('maskconst', 'alpha');
$maskvalue = GETPOST('maskvalue', 'alpha');
if ($maskconstorder) {
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
if ($maskconst) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
}