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

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

Browse Source 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
This commit is contained in:
Laurent Destailleur
2015-02-19 00:01:26 +01:00
parent 25ba9d2c97 774389940e
commit e3713c8b6d
123 changed files with 534 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/modules/modProductBatch.class.php
View File

@@ -112,8 +112,16 @@ class modProductBatch extends DolibarrModules
*/
function init($options='')
{
global $db,$conf;
$sql = array();
if(! empty($conf->cashdesk->enabled)) {
if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
}
}
return $this->_init($sql, $options);
}