diff --git a/src-db/database/model/tables/OBDO_DISTORDERLINE.xml b/src-db/database/model/tables/OBDO_DISTORDERLINE.xml
--- a/src-db/database/model/tables/OBDO_DISTORDERLINE.xml
+++ b/src-db/database/model/tables/OBDO_DISTORDERLINE.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -2741,7 +2741,7 @@
-
+
diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml
--- a/src-db/database/sourcedata/AD_REFERENCE.xml
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml
@@ -68,6 +68,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_SEARCH.xml b/src-db/database/sourcedata/AD_REF_SEARCH.xml
--- a/src-db/database/sourcedata/AD_REF_SEARCH.xml
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml
@@ -1,5 +1,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
@@ -1,5 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
@@ -22,6 +22,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,6 +90,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -107,6 +174,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -173,6 +283,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -219,6 +351,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -263,6 +417,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -307,6 +483,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -329,6 +527,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/distributionorder/info/ProductWithStockSelectorFilterExpression.java b/src/org/openbravo/distributionorder/info/ProductWithStockSelectorFilterExpression.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/distributionorder/info/ProductWithStockSelectorFilterExpression.java
@@ -0,0 +1,54 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2018 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ *************************************************************************
+ */
+
+package org.openbravo.distributionorder.info;
+
+import java.util.Map;
+
+import org.openbravo.client.application.FilterExpression;
+import org.openbravo.dal.core.OBContext;
+
+public class ProductWithStockSelectorFilterExpression implements FilterExpression {
+
+ @Override
+ public String getExpression(Map requestMap) {
+ String warehouseReceiptID = requestMap.get("inpmWarehouseReceiptId");
+ boolean isSalesTransaction = Boolean.parseBoolean(requestMap.get("inpissotrx"));
+ String warehouseIssueID = requestMap.get("inpmWarehouseIssueId");
+
+ StringBuilder filter = getFilterByClientAndItemAndStockedNotGenericProducts();
+ if (isSalesTransaction) {
+ filter.append(" and (e.warehouse is null or e.warehouse.id ='" + warehouseIssueID + "')");
+ } else {
+ filter.append(" and (e.warehouse is null or e.warehouse.id ='" + warehouseReceiptID + "')");
+ }
+ return filter.toString();
+ }
+
+ private StringBuilder getFilterByClientAndItemAndStockedNotGenericProducts() {
+ StringBuilder filter = new StringBuilder("");
+ filter.append(" e.product.active = 'Y' ");
+ filter.append(" and e.product.isGeneric = 'N'");
+ filter.append(" and e.product.productType = 'I' ");
+ filter.append(" and e.product.stocked = 'Y'");
+ filter.append(" and e.product.client.id = '"
+ + OBContext.getOBContext().getCurrentClient().getId() + "'");
+ return filter;
+ }
+}