diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index aefec319d65..d5b0d898a9c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1636,9 +1636,13 @@ class Form
* @param int $forcecombo Force to use combo box
* @param string $morecss Add more css on select
* @param int $hidepriceinlabel 1=Hide prices in label
+ * @param string $warehouseStatus warehouse status filter, following comma separated filter options can be used
+ * 'warehouseopen' = select products from open warehouses,
+ * 'warehouseclosed' = select products from closed warehouses,
+ * 'warehouseinternal' = select products from warehouses for internal correct/transfer only
* @return void
*/
- function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0, $morecss='', $hidepriceinlabel=0, $warehouseStatus=0)
+ function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0, $morecss='', $hidepriceinlabel=0, $warehouseStatus='')
{
global $langs,$conf;
@@ -1699,18 +1703,39 @@ class Form
* @param int $forcecombo Force to use combo box
* @param string $morecss Add more css on select
* @param int $hidepriceinlabel 1=Hide prices in label
- * @param int $warehouseStatus Additional warehousestatus to filter (products with stock from status 1 are always shown)
+ * @param string $warehouseStatus warehouse status filter, following comma separated filter options can be used
+ * 'warehouseopen' = select products from open warehouses,
+ * 'warehouseclosed' = select products from closed warehouses,
+ * 'warehouseinternal' = select products from warehouses for internal correct/transfer only
* @return array Array of keys for json
*/
- function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0,$morecss='',$hidepriceinlabel=0, $warehouseStatus=0)
+ function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0,$morecss='',$hidepriceinlabel=0, $warehouseStatus='')
{
global $langs,$conf,$user,$db;
$out='';
$outarray=array();
+ $warehouseStatusArray = array();
+ if (! empty($warehouseStatus))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+ if (preg_match('/warehouseclosed/', $warehouseStatus))
+ {
+ $warehouseStatusArray[] = Entrepot::STATUS_CLOSED;
+ }
+ if (preg_match('/warehouseopen/', $warehouseStatus))
+ {
+ $warehouseStatusArray[] = Entrepot::STATUS_OPEN_ALL;
+ }
+ if (preg_match('/warehouseinternal/', $warehouseStatus))
+ {
+ $warehouseStatusArray[] = Entrepot::STATUS_OPEN_INTERNAL;
+ }
+ }
+
$selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
- $warehouseStatus ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
+ (count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
$sql = "SELECT ";
$sql.= $selectFields . $selectFieldsGrouped;
@@ -1741,7 +1766,7 @@ class Form
$selectFields.= ", price_rowid, price_by_qty";
}
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- if ($warehouseStatus)
+ if (count($warehouseStatusArray))
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";
@@ -1757,9 +1782,9 @@ class Form
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
}
$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
- if ($warehouseStatus)
+ if (count($warehouseStatusArray))
{
- $sql.= ' AND (p.fk_product_type = 1 OR e.statut IN (1, '.$warehouseStatus.'))';
+ $sql.= ' AND (p.fk_product_type = 1 OR e.statut IN ('.implode(',',$warehouseStatusArray).'))';
}
if ($finished == 0)
{
@@ -1796,7 +1821,7 @@ class Form
if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
$sql.=')';
}
- if ($warehouseStatus)
+ if (count($warehouseStatusArray))
{
$sql.= ' GROUP BY'.$selectFields;
}
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index fa0553af1a3..beeecf9f511 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -187,8 +187,7 @@ else {
if ($conf->global->ENTREPOT_EXTRA_STATUS)
{
// hide products in closed warehouse, but show products for internal transfer
- require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
- $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, '1', 0, '', 0, Entrepot::STATUS_OPEN_INTERNAL);
+ $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, '1', 0, '', 0, 'warehouseopen,warehouseinternal');
}
else
{
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index bffc5f15531..0510299fbd7 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -50,7 +50,7 @@ $id = GETPOST('id', 'int');
$price_by_qty_rowid = GETPOST('pbq', 'int');
$finished = GETPOST('finished', 'int');
$alsoproductwithnosupplierprice = GETPOST('alsoproductwithnosupplierprice', 'int');
-$warehouseStatus = GETPOST('warehousestatus', 'int');
+$warehouseStatus = GETPOST('warehousestatus', 'alpha');
/*
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index c077859dde1..dda92ea0c0f 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -55,18 +55,36 @@ class FormProduct
*
* @param int $fk_product Add quantity of stock in label for product with id fk_product. Nothing if 0.
* @param string $batch Add quantity of batch stock in label for product with batch name batch, batch name precedes batch_id. Nothing if ''.
- * @param int $status additional filter on status other then 1
+ * @param string $status warehouse status filter, following comma separated filter options can be used
+ * 'warehouseopen' = select products from open warehouses,
+ * 'warehouseclosed' = select products from closed warehouses,
+ * 'warehouseinternal' = select products from warehouses for internal correct/transfer only
* @param boolean $sumStock sum total stock of a warehouse, default true
* @param array $exclude warehouses ids to exclude
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO
*/
- function loadWarehouses($fk_product=0, $batch = '', $status=null, $sumStock = true, $exclude='')
+ function loadWarehouses($fk_product=0, $batch = '', $status='', $sumStock = true, $exclude='')
{
global $conf, $langs;
if (empty($fk_product) && count($this->cache_warehouses)) return 0; // Cache already loaded and we do not want a list with information specific to a product
if (is_array($exclude)) $excludeGroups = implode("','",$exclude);
+
+ $warehouseStatus = array();
+
+ if (preg_match('/warehouseclosed/', $status))
+ {
+ $warehouseStatus[] = Entrepot::STATUS_CLOSED;
+ }
+ if (preg_match('/warehouseopen/', $status))
+ {
+ $warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
+ }
+ if (preg_match('/warehouseinternal/', $status))
+ {
+ $warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
+ }
$sql = "SELECT e.rowid, e.label, e.description, e.fk_parent";
if (!empty($fk_product))
@@ -95,9 +113,9 @@ class FormProduct
}
}
$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
- if (!empty($status))
+ if (count($warehouseStatus))
{
- $sql.= " AND e.statut IN (1, ".$status.")";
+ $sql.= " AND e.statut IN (".implode(',',$warehouseStatus).")";
}
else
{
@@ -169,7 +187,10 @@ class FormProduct
*
* @param int $selected Id of preselected warehouse ('' for no value, 'ifone'=select value if one value otherwise no value)
* @param string $htmlname Name of html select html
- * @param string $filterstatus For filter, additional filter on status other then 1 (open_all). No filter when empty
+ * @param string $filterstatus warehouse status filter, following comma separated filter options can be used
+ * 'warehouseopen' = select products from open warehouses,
+ * 'warehouseclosed' = select products from closed warehouses,
+ * 'warehouseinternal' = select products from warehouses for internal correct/transfer only
* @param int $empty 1=Can be empty, 0 if not
* @param int $disabled 1=Select is disabled
* @param int $fk_product Add quantity of stock in label for product with id fk_product. Nothing if 0.
@@ -190,7 +211,7 @@ class FormProduct
$out='';
if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) $filterstatus = '';
- $this->loadWarehouses($fk_product, '', + $filterstatus, true, $exclude); // filter on numeric status
+ $this->loadWarehouses($fk_product, '', $filterstatus, true, $exclude);
$nbofwarehouses=count($this->cache_warehouses);
if ($conf->use_javascript_ajax && ! $forcecombo)
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 7a1ef75e9fd..ce585fb7587 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -383,11 +383,11 @@ if ($conf->productbatch->enabled)
}
// In warehouse
print '