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

Update commonobject.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2022-07-29 15:26:34 +02:00 committed by GitHub
parent e9528443b2
commit 6d2219e00c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8189,7 +8189,7 @@ abstract class CommonObject
$("select[name=\""+child_list+"\"] option[parent]").remove(); $("select[name=\""+child_list+"\"] option[parent]").remove();
$("select[name=\""+child_list+"\"]").append(options); $("select[name=\""+child_list+"\"]").append(options);
} }
} else if(val > 0) { } elseif(val > 0) {
var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone(); var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
$("select[name=\""+child_list+"\"] option[parent]").remove(); $("select[name=\""+child_list+"\"] option[parent]").remove();
$("select[name=\""+child_list+"\"]").append(options); $("select[name=\""+child_list+"\"]").append(options);
@ -8212,7 +8212,7 @@ abstract class CommonObject
if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){ if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){
$("#"+child_list).hide(); $("#"+child_list).hide();
//Show mother lists //Show mother lists
} else if ($("#"+parent_list).val() != 0){ } elseif ($("#"+parent_list).val() != 0){
$("#"+parent_list).show(); $("#"+parent_list).show();
} }
//Show the child list if the parent list value is selected //Show the child list if the parent list value is selected
@ -8320,8 +8320,8 @@ abstract class CommonObject
/** /**
* Get buy price to use for margin calculation. This function is called when buy price is unknown. * Get buy price to use for margin calculation. This function is called when buy price is unknown.
* Set buy price = sell price if ForceBuyingPriceIfNull configured, * Set buy price = sell price if ForceBuyingPriceIfNull configured,
* else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice * elseif calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice
* else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice * elseif calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice
* else set min buy price as buy price * else set min buy price as buy price
* *
* @param float $unitPrice Product unit price * @param float $unitPrice Product unit price
@ -8934,7 +8934,7 @@ abstract class CommonObject
return 'NULL'; return 'NULL';
} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) { } elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
return price2num("$value"); return price2num("$value");
} else if (preg_match('/int$/i', $fieldsentry['type'])) { } elseif (preg_match('/int$/i', $fieldsentry['type'])) {
return (int)$value; return (int)$value;
} elseif ($fieldsentry['type'] == 'boolean') { } elseif ($fieldsentry['type'] == 'boolean') {
if ($value) { if ($value) {