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

Merge remote-tracking branch 'origin/3.8' into 3.9

Browse Source 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
This commit is contained in:
Laurent Destailleur 2016-12-11 02:34:59 +01:00
commit b42a2616bc
35 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,7 +911,7 @@ class Product extends CommonObject
// Delete all child tables // Delete all child tables
if (! $error) if (! $error)
{ {
$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price'); $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_batch');
foreach($elements as $table) foreach($elements as $table)
{ {
if (! $error) if (! $error)