diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 24414c513e68154e2ad45318565fcf443fd9e23b..2c07baba5a05f6382e9a368d315d4f1ddeaec255 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1300,7 +1300,7 @@ class BonPrelevement extends CommonObject while ($i < $num) { $obj = $this->db->fetch_object($resql); - $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures , $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); + $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum); $this->total = $this->total + $obj->somme; $i++; } diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index d9d972cc25c282f3c7ebf931e3da547805b56a70..7a432a1109e408b913b8f2936358f1a5923287d8 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -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_datehour (task_datehour); -ALTER TABLE llx_projet_task CHANGE 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 duration_effective real DEFAULT 0 NULL; +ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL; -- add extrafield on ficheinter lines diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php index 1ef993c479d350a5f4b2db08b74816b07998ca8a..486e83732558472b6d9fc01c610bb5845260f71b 100644 --- a/htdocs/product/stock/lib/replenishment.lib.php +++ b/htdocs/product/stock/lib/replenishment.lib.php @@ -37,7 +37,7 @@ function dolDispatchToDo($order_id) $dispatched = 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.= ' WHERE fk_commande = ' . $order_id; $sql.= ' GROUP BY fk_product'; @@ -49,7 +49,7 @@ function dolDispatchToDo($order_id) $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.= ' WHERE fk_commande = ' . $order_id; $sql.= ' AND fk_product > 0';