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

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

Browse Source 
Conflicts:
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2018-09-01 14:09:00 +02:00
commit 123a66dc2a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4572,8 +4572,6 @@ class Product extends CommonObject
$langs->load('products'); $langs->load('products');
//$this->db->begin();
$label_type = 'label'; $label_type = 'label';
if ($type == 'short') if ($type == 'short')