From 47abbd3eb2865907d098e97ac1d68adc707d49a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Oct 2018 14:23:36 +0200 Subject: [PATCH 1/2] Fix bad merge --- htdocs/core/actions_massactions.inc.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index cb77489d397..696e1135ca9 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -1017,16 +1017,6 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == } } - if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1); - else $result = $objecttmp->delete($user); - if ($result <= 0) - { - setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); - $error++; - break; - } - else $nbok++; - if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1); else $result = $objecttmp->delete($user); From 57ad200ae50f28f95cf9e615543e6ada7e20c570 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Oct 2018 14:43:10 +0200 Subject: [PATCH 2/2] Fix regression in creating discount --- htdocs/core/class/discount.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index e1796c38421..b174848cadf 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -147,8 +147,17 @@ class DiscountAbsolute $this->amount_ht=price2num($this->amount_ht); $this->amount_tva=price2num($this->amount_tva); $this->amount_ttc=price2num($this->amount_ttc); + $this->tva_tx=price2num($this->tva_tx); + $this->multicurrency_amount_ht=price2num($this->multicurrency_amount_ht); + $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva); + $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc); + + if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0; + if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0; + if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0; + // Check parameters if (empty($this->description)) {