diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a4177a72f86..152ad8a22e0 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -501,7 +501,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); } } elseif ($action == 'setremise' && $usercancreate) { - $result = $object->set_remise($user, GETPOST('remise')); + $result = $object->setDiscount($user, GETPOST('remise')); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); @@ -607,7 +607,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); } } elseif ($action == 'setremisepercent' && $usercancreate) { - $result = $object->set_remise($user, price2num(GETPOST('remise_percent'), 2)); + $result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), 2)); } elseif ($action == 'setremiseabsolue' && $usercancreate) { $result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU')); } elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha')) { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 3d359ca6563..4cdff4afbf4 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2359,6 +2359,8 @@ class Commande extends CommonOrder /** * Applique une remise relative * + * @deprecated + * @see setDiscount() * @param User $user User qui positionne la remise * @param float $remise Discount (percent) * @param int $notrigger 1=Does not execute triggers, 0= execute triggers @@ -2367,6 +2369,20 @@ class Commande extends CommonOrder public function set_remise($user, $remise, $notrigger = 0) { // phpcs:enable + dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE); + return $this->setDiscount($user, $remise, $notrigger); + } + + /** + * Applique une remise relative + * + * @param User $user User qui positionne la remise + * @param float $remise Discount (percent) + * @param int $notrigger 1=Does not execute triggers, 0= execute triggers + * @return int <0 if KO, >0 if OK + */ + public function setDiscount($user, $remise, $notrigger = 0) + { $remise = trim($remise) ?trim($remise) : 0; if ($user->rights->commande->creer) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 8082ad1ff43..befbca0bc26 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -483,7 +483,7 @@ if (empty($reshook)) $result = $object->setBankAccount(GETPOST('fk_account', 'int')); } elseif ($action == 'setremisepercent' && $usercancreate) { $object->fetch($id); - $result = $object->set_remise($user, price2num(GETPOST('remise_percent'), 2)); + $result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), 2)); } elseif ($action == "setabsolutediscount" && $usercancreate) { // POST[remise_id] or POST[remise_id_for_payment] diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d0519627d4b..929ce01236a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3617,6 +3617,8 @@ class Facture extends CommonInvoice /** * Set percent discount * + * @deprecated + * @see setDiscount() * @param User $user User that set discount * @param double $remise Discount * @param int $notrigger 1=Does not execute triggers, 0= execute triggers @@ -3625,6 +3627,20 @@ class Facture extends CommonInvoice public function set_remise($user, $remise, $notrigger = 0) { // phpcs:enable + dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE); + return $this->setDiscount($user, $remise, $notrigger); + } + + /** + * Set percent discount + * + * @param User $user User that set discount + * @param double $remise Discount + * @param int $notrigger 1=Does not execute triggers, 0= execute triggers + * @return int <0 if ko, >0 if ok + */ + public function setDiscount($user, $remise, $notrigger = 0) + { // Clean parameters if (empty($remise)) $remise = 0;