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

Merge pull request #1514 from KreizIT/batchfix

Browse Source 
Batch Fix
This commit is contained in:
Laurent Destailleur 2014-03-27 16:08:44 +01:00
commit d629c55e11
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/class/expeditionbatch.class.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file expedtion/class/productbatch.class.php * \file expedition/class/productbatch.class.php
* \ingroup productbatch * \ingroup productbatch
* \brief This file implements CRUD method for managing product's shipment * \brief This file implements CRUD method for managing product's shipment
* with batch record * with batch record

2
htdocs/expedition/fiche.php
View File

@ -856,7 +856,7 @@ if ($action == 'create')
if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0; if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0;
} }
if (empty($conf->productbatch->enabled) || ! $product->hasbatch()) { if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_array($product->stock_warehouse[GETPOST('entrepot_id','int')] ))) {
// Quantity to send // Quantity to send
print '<td align="center">'; print '<td align="center">';
if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))