Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur
2015-08-13 00:06:27 +02:00
parent a8c2dfd445 d3f004d407
commit 4b51fc80a6
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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