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

Merge pull request #3275 from marcosgdf/bug-3206

Browse Source 
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
This commit is contained in:
Laurent Destailleur 2015-08-12 23:25:29 +02:00
commit d3f004d407
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -27,6 +27,7 @@ Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter
Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
***** ChangeLog for 3.5.6 compared to 3.5.5 ***** ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973 Fix: Avoid missing class error for fetch_thirdparty method #1973

13
htdocs/comm/propal/class/propal.class.php
View File

@ -528,13 +528,14 @@ class Propal extends CommonObject
$price = $pu - $remise; $price = $pu - $remise;
} }
// Update line //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new PropaleLigne($this->db); $line = new PropaleLigne($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new PropaleLigne($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)

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

@ -2349,13 +2349,14 @@ class Commande extends CommonOrder
$price = ($pu - $remise); $price = ($pu - $remise);
} }
// Update line //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new OrderLine($this->db); $line = new OrderLine($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new OrderLine($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)

13
htdocs/compta/facture/class/facture.class.php
View File

@ -2224,13 +2224,14 @@ class Facture extends CommonInvoice
} }
$price = price2num($price); $price = price2num($price);
// Update line into database //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new FactureLigne($this->db); $line = new FactureLigne($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new FactureLigne($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)