Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
This commit is contained in:
Laurent Destailleur
2015-02-26 13:36:07 +01:00
parent b9d3175897 fe7889e266
commit daabc113a5
21 changed files with 473 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -877,6 +877,8 @@ class Commande extends CommonOrder
$error=0;
$this->context['createfromclone'] = 'createfromclone';
$this->db->begin();
// get extrafields so they will be clone
@@ -941,6 +943,8 @@ class Commande extends CommonOrder
// End call triggers
}
unset($this->context['createfromclone']);
// End
if (! $error)
{
@@ -1200,6 +1204,8 @@ class Commande extends CommonOrder
// Insert line
$this->line=new OrderLine($this->db);
$this->line->context = $this->context;
$this->line->fk_commande=$this->id;
$this->line->label=$label;
$this->line->desc=$desc;
@@ -1314,6 +1320,8 @@ class Commande extends CommonOrder
$line=new OrderLine($this->db);
$line->context = $this->context;
$line->fk_product=$idproduct;
$line->desc=$prod->description;
$line->qty=$qty;
@@ -2396,6 +2404,8 @@ class Commande extends CommonOrder
// Update line
$this->line=new OrderLine($this->db);
$this->line->context = $this->context;
// Stock previous line records
$staticline=new OrderLine($this->db);
$staticline->fetch($rowid);