lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memorize line before delete (for triggers)

Browse Source
This commit is contained in:
Christophe Battarel 2019-03-27 12:05:42 +01:00
parent 661a984b8e
commit 3006e2bf75
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/commande/class/commande.class.php
View File

@ -1367,7 +1367,7 @@ class Commande extends CommonOrder
// Check parameters // Check parameters
if ($type < 0) return -1; if ($type < 0) return -1;
if ($date_start && $date_end && $date_start > $date_end) { if ($date_start && $date_end && $date_start > $date_end) {
$langs->load("errors"); $langs->load("errors");
$this->error=$langs->trans('ErrorStartDateGreaterEnd'); $this->error=$langs->trans('ErrorStartDateGreaterEnd');
@ -2194,6 +2194,12 @@ class Commande extends CommonOrder
// For triggers // For triggers
$line->fetch($lineid); $line->fetch($lineid);
// Memorize previous line for triggers
$staticline=new OrderLine($this->db);
$staticline->fetch($lineid);
$staticline->fetch_optionals($lineid);
$line->oldline = $staticline;
if ($line->delete($user) > 0) if ($line->delete($user) > 0)
{ {
$result=$this->update_price(1); $result=$this->update_price(1);
@ -2947,7 +2953,7 @@ class Commande extends CommonOrder
if (empty($txlocaltax2)) $txlocaltax2=0; if (empty($txlocaltax2)) $txlocaltax2=0;
if (empty($remise_percent)) $remise_percent=0; if (empty($remise_percent)) $remise_percent=0;
if (empty($special_code) || $special_code == 3) $special_code=0; if (empty($special_code) || $special_code == 3) $special_code=0;
if ($date_start && $date_end && $date_start > $date_end) { if ($date_start && $date_end && $date_start > $date_end) {
$langs->load("errors"); $langs->load("errors");
$this->error=$langs->trans('ErrorStartDateGreaterEnd'); $this->error=$langs->trans('ErrorStartDateGreaterEnd');
@ -2962,7 +2968,7 @@ class Commande extends CommonOrder
$txtva=price2num($txtva); $txtva=price2num($txtva);
$txlocaltax1=price2num($txlocaltax1); $txlocaltax1=price2num($txlocaltax1);
$txlocaltax2=price2num($txlocaltax2); $txlocaltax2=price2num($txlocaltax2);
$this->db->begin(); $this->db->begin();
// Calcul du total TTC et de la TVA pour la ligne a partir de // Calcul du total TTC et de la TVA pour la ligne a partir de