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

fix conflict with last commit

Browse Source
This commit is contained in:
thibdrev
2024-01-24 07:45:37 +01:00
committed by GitHub
parent 1a0639662f
commit d0224e0714
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@@ -6864,6 +6864,7 @@ abstract class CommonObject
$this->array_options["options_".$key] = $new_array_options["options_".$key];
}
break;
case 'price':
case 'double':
$value = price2num($value);
if (!is_numeric($value) && $value != '') {
@@ -6886,11 +6887,6 @@ abstract class CommonObject
$this->array_options["options_".$key] = $new_array_options["options_".$key];
}
break;*/
case 'price':
$new_array_options["options_".$key] = price2num($this->array_options["options_".$key]);
$this->array_options["options_".$key] = $new_array_options["options_".$key];
break;
case 'password':
$algo = '';
if ($this->array_options["options_".$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {