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

FIX api orders : forward database error on failure (backpot commit d9e81cb) (#35478 )
FIX extra field list depend on parent list when editing a card (#35165 )
2025-09-25 11:54:18 +02:00 · 2025-09-25 11:47:51 +02:00 · 2025-09-01 19:55:00 +02:00
2 changed files with 2 additions and 2 deletions
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1164,7 +1164,7 @@ class Commande extends CommonOrder
 				}
 			}
 		} else {
-			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8048,7 +8048,7 @@ abstract class CommonObject
 								    $("#"+child_list).hide();
 								//Show mother lists
 								} else if ($("#"+parent_list).val() != 0){
-								    $("#"+parent_list).show();
+								    showOptions'.$type.'(child_list, parent_list, orig_select[child_list]);
 								}
 								//Show the child list if the parent list value is selected
 								$("select[name=\""+parent_list+"\"]").click(function() {
Author	SHA1	Message	Date
ldestailleur	a4601686a6	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2025-09-25 11:54:18 +02:00
lvessiller-opendsi	bcf6d6a7a2	FIX api orders : forward database error on failure (backpot commit `d9e81cb`) (#35478 )	2025-09-25 11:47:51 +02:00
lvessiller-opendsi	e818bf732d	FIX extra field list depend on parent list when editing a card (#35165 )	2025-09-01 19:55:00 +02:00