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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-07-10 19:19:08 +02:00
commit 840d9b182b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/extrafields.class.php
View File

@ -2072,7 +2072,7 @@ class ExtraFields
if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) { if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
continue; continue;
} }
if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && $this->attributes[$object->table_element]['type'][$key] != 'boolean') { if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
//when unticking boolean field, it's not set in POST //when unticking boolean field, it's not set in POST
continue; continue;
} }

4
htdocs/variants/class/ProductCombination.class.php
View File

@ -602,6 +602,10 @@ class ProductCombination
$prodcomb2val = new ProductCombination2ValuePair($this->db); $prodcomb2val = new ProductCombination2ValuePair($this->db);
$prodcomb = new ProductCombination($this->db); $prodcomb = new ProductCombination($this->db);
$features = array_filter($features, function ($v) {
return !empty($v);
});
foreach ($features as $attr => $attr_val) { foreach ($features as $attr => $attr_val) {
$actual_comp[$attr] = $attr_val; $actual_comp[$attr] = $attr_val;
} }