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

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

Browse Source
This commit is contained in:
Laurent Destailleur
2023-11-18 01:35:25 +01:00
parent a0f962ce96 b4f31eeee8
commit c19fc54298
3 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3468,7 +3468,7 @@ abstract class CommonObject
*
* @param string $note New value for note
* @param string $suffix '', '_public' or '_private'
* @param int $notrigger 1=Does not execute triggers, 0=execute triggers
* @param int $notrigger 1=Does not execute triggers, 0=execute triggers
* @return int <0 if KO, >0 if OK
*/
public function update_note($note, $suffix = '', $notrigger = 0)
@@ -3515,32 +3515,34 @@ abstract class CommonObject
$this->note = $note; // deprecated
$this->note_private = $note;
}
if(empty($notrigger)) {
switch($this->element) {
case 'societe':
$trigger_name = 'COMPANY_MODIFY';
break;
case 'commande':
$trigger_name = 'ORDER_MODIFY';
break;
case 'facture':
$trigger_name = 'BILL_MODIFY';
break;
case 'invoice_supplier':
$trigger_name = 'BILL_SUPPLIER_MODIFY';
break;
case 'facturerec':
$trigger_name = 'BILLREC_MODIFIY';
break;
case 'expensereport':
$trigger_name = 'EXPENSE_REPORT_MODIFY';
break;
default:
$trigger_name = strtoupper($this->element) . '_MODIFY';
}
$ret = $this->call_trigger($trigger_name, $user);
if($ret < 0 ) { return -1; }
}
if (empty($notrigger)) {
switch ($this->element) {
case 'societe':
$trigger_name = 'COMPANY_MODIFY';
break;
case 'commande':
$trigger_name = 'ORDER_MODIFY';
break;
case 'facture':
$trigger_name = 'BILL_MODIFY';
break;
case 'invoice_supplier':
$trigger_name = 'BILL_SUPPLIER_MODIFY';
break;
case 'facturerec':
$trigger_name = 'BILLREC_MODIFIY';
break;
case 'expensereport':
$trigger_name = 'EXPENSE_REPORT_MODIFY';
break;
default:
$trigger_name = strtoupper($this->element) . '_MODIFY';
}
$ret = $this->call_trigger($trigger_name, $user);
if($ret < 0 ) {
return -1;
}
}
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -8690,8 +8692,8 @@ abstract class CommonObject
var val = $("select[name=\""+parent_list+"\"]").val();
var parentVal = parent_list + ":" + val;
if(typeof val == "string"){
if(val != "") {
var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
if(val != "") {
var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
$("select[name=\""+child_list+"\"] option[parent]").remove();
$("select[name=\""+child_list+"\"]").append(options);
} else {
@@ -8699,7 +8701,7 @@ abstract class CommonObject
$("select[name=\""+child_list+"\"] option[parent]").remove();
$("select[name=\""+child_list+"\"]").append(options);
}
} else if(val > 0) {
} else if(val > 0) {
var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
$("select[name=\""+child_list+"\"] option[parent]").remove();
$("select[name=\""+child_list+"\"]").append(options);
@@ -8720,15 +8722,15 @@ abstract class CommonObject
//Hide daughters lists
if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){
$("#"+child_list).hide();
$("#"+child_list).hide();
//Show mother lists
} else if ($("#"+parent_list).val() != 0){
$("#"+parent_list).show();
$("#"+parent_list).show();
}
//Show the child list if the parent list value is selected
$("select[name=\""+parent_list+"\"]").click(function() {
if ($(this).val() != 0){
$("#"+child_list).show()
if ($(this).val() != 0){
$("#"+child_list).show()
}
});