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

pcpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-04 01:10:23 +01:00
parent 35733c4c08
commit fa2e57eaa3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@ -1095,8 +1095,8 @@ ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date); ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour); ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
ALTER TABLE llx_projet_task CHANGE COLUMN duration_effective real DEFAULT 0 NULL; ALTER TABLE llx_projet_task MODIFY COLUMN duration_effective real DEFAULT 0 NULL;
ALTER TABLE llx_projet_task CHANGE COLUMN planned_workload real DEFAULT 0 NULL; ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL;
-- add extrafield on ficheinter lines -- add extrafield on ficheinter lines

4
htdocs/product/stock/lib/replenishment.lib.php
View File

@ -37,7 +37,7 @@ function dolDispatchToDo($order_id)
$dispatched = array(); $dispatched = array();
$ordered = array(); $ordered = array();
# Count nb of quantity dispatched per product // Count nb of quantity dispatched per product
$sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'; $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch';
$sql.= ' WHERE fk_commande = ' . $order_id; $sql.= ' WHERE fk_commande = ' . $order_id;
$sql.= ' GROUP BY fk_product'; $sql.= ' GROUP BY fk_product';
@ -49,7 +49,7 @@ function dolDispatchToDo($order_id)
$dispatched[$obj->fk_product] = $obj; $dispatched[$obj->fk_product] = $obj;
} }
# Count nb of quantity to dispatch per product // Count nb of quantity to dispatch per product
$sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet'; $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet';
$sql.= ' WHERE fk_commande = ' . $order_id; $sql.= ' WHERE fk_commande = ' . $order_id;
$sql.= ' AND fk_product > 0'; $sql.= ' AND fk_product > 0';