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

Finished new module to manage expense reports !

Browse Source 
Fix export to support corectly multicompany
This commit is contained in:
Laurent Destailleur
2015-02-22 13:16:49 +01:00
parent 6d1324b463
commit 2bc6ac4671
31 changed files with 1189 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modStock.class.php
View File

@@ -131,7 +131,7 @@ class modStock extends DolibarrModules
$this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
$this->export_sql_end[$r] .=' AND e.entity = '.$conf->entity;
$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
// Imports