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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

Browse Source 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
This commit is contained in:
Regis Houssin
2017-08-22 18:49:40 +02:00
parent 0dc0fe81fc 9cd5c8a564
commit 2f537a1ade
1317 changed files with 14793 additions and 8360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1000,7 +1000,7 @@ class Commande extends CommonOrder
$this->db->begin();
// get extrafields so they will be clone
// get lines so they will be clone
foreach($this->lines as $line)
$line->fetch_optionals($line->rowid);