diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index f77b260bed3a67d8ad3cc67716cb66062fe8057b..f267ab0a496fe97090e922e4820b2e1a22cfe63a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3196,7 +3196,7 @@ class FactureLigne $this->rowid = $objp->rowid; $this->fk_facture = $objp->fk_facture; $this->fk_parent_line = $objp->fk_parent_line; - $this->label = $objp->label; + $this->label = $objp->custom_label; $this->desc = $objp->description; $this->qty = $objp->qty; $this->subprice = $objp->subprice; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 69c5b37ce697ecbfce92936d82ece3047cf0e1b6..fd9ed4ba2259ee22b83dc5515108b27e70b9dd6f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2315,8 +2315,8 @@ class Form $autoOpen=false; $dialogconfirm.='-'.$button; } - $pageyes=(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes'; - $pageno=($useajax == 2 ? (preg_match('/\?/',$page)?'&':'?').'confirm=no':''); + $pageyes=$page.(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes'; + $pageno=($useajax == 2 ? $page.(preg_match('/\?/',$page)?'&':'?').'confirm=no':''); // Add input fields into list of fields to read during submit (inputok and inputko) if (is_array($formquestion)) {