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

FIX No check warehouse is provided if module stock is not enabled.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-06-03 21:21:20 +02:00
parent 6e72d3c8cc
commit f437bd2d6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/expedition/class/expedition.class.php
View File

@ -752,10 +752,11 @@ class Expedition extends CommonObject
$orderline = new OrderLine($this->db); $orderline = new OrderLine($this->db);
$orderline->fetch($id); $orderline->fetch($id);
$fk_product = $orderline->fk_product;
if (! empty($orderline->fk_product)) if (! empty($conf->stock->enabled) && ! empty($orderline->fk_product))
{ {
$fk_product = $orderline->fk_product;
if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
{ {
$this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine"); $this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine");