diff --git a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
--- a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
+++ b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo S.L.U.
- * All portions are Copyright (C) 2014-2015 Openbravo S.L.U.
+ * All portions are Copyright (C) 2014-2016 Openbravo S.L.U.
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -370,6 +370,7 @@
   BUTTON_SEARCHPRODUCT_CRAMPONS10POINT("Crampons 10 point", EnyoKind.SEARCHPRODUCT), //
   BUTTON_SEARCHPRODUCT_BASECAMPLANTERN("Basecamp lantern", EnyoKind.SEARCHPRODUCT), //
   BUTTON_SEARCHPRODUCT_MULTITOOL("Multi-tool", EnyoKind.SEARCHPRODUCT), //
+  BUTTON_SEARCHPRODUCT_SOLARCHARGER("Solar charger", EnyoKind.SEARCHPRODUCT), //
   BUTTON_SEARCHPRODUCT_THERMO1L("Thermo 1 L", EnyoKind.SEARCHPRODUCT), //
   BUTTON_SEARCHPRODUCT_UNISEXNORDICTOURINGSKIS("Unisex nordic touring skis", EnyoKind.SEARCHPRODUCT), //
   BUTTON_SEARCHPRODUCT_GPSHANDHELD("GPS handheld", EnyoKind.SEARCHPRODUCT), //
@@ -469,6 +470,8 @@
   BUTTON_EDIT_Services("actionButtonsContainer_showRelatedServices", EnyoKind.BUTTON), //
 
   BUTTON_STORE_STOCK("body_stockHere", EnyoKind.BUTTON), //
+  BUTTON_STORE_STOCK_ROW1("scrollListStockDetailsClickable_row1_stockInStoreLineClickable",
+      EnyoKind.BUTTON), //
   BUTTON_STORE_STOCK_ROW2("scrollListStockDetailsClickable_row2_stockInStoreLineClickable",
       EnyoKind.BUTTON),
 
@@ -1195,7 +1198,7 @@
   // Coupon Code
   LABEL_COUPONCODE("bodyContent_couponcode"), //
   BUTTON_COUPONCODE_APPLY("bodyButtons_okButton", EnyoKind.BUTTON), //
-  
+
   // Returns Approval
   FIELD_APPROVAL_USERNAME("bodyContent_username"), //
   FIELD_APPROVAL_PASSWORD("bodyContent_password"), //
diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32097_SelectWarehouseForReturns.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32097_SelectWarehouseForReturns.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32097_SelectWarehouseForReturns.java
@@ -0,0 +1,121 @@
+/*
+ *************************************************************************
+ * 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 S.L.U.
+ * All portions are Copyright (C) 2016 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author GIG
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.receipts;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.SeleniumHelper;
+import org.openbravo.test.mobile.common.selenium.database.DatabaseHelperSelect;
+import org.openbravo.test.mobile.common.selenium.javascript.BackboneHelper;
+import org.openbravo.test.mobile.common.selenium.javascript.TestId;
+import org.openbravo.test.mobile.common.selenium.terminals.WebPOSTerminalHelper;
+
+public class I32097_SelectWarehouseForReturns extends WebPOSTerminalHelper {
+
+  @Test
+  public void test() {
+
+    // reload the master data
+    this.updateTerminalAfterDatabaseChange();
+
+    final Boolean whSelectionEnabled = (Boolean) SeleniumHelper
+        .executeScriptWithReturn("OB.MobileApp.model.get('permissions').OBPOS_warehouseselectionforline;");
+
+    SeleniumHelper
+        .executeScript("OB.MobileApp.model.get('permissions').OBPOS_warehouseselectionforline=true;");
+
+    tap(TestId.BUTTON_SEARCH);
+    write(TestId.FIELD_SEARCH_TEXT, "Multi-tool");
+    tap(TestId.BUTTON_SEARCH_EXECUTE);
+    tap(TestId.BUTTON_SEARCHPRODUCT_MULTITOOL);
+    tap(TestId.BUTTON_STORE_STOCK);
+    tap(TestId.BUTTON_STORE_STOCK_ROW2);
+    tap(TestId.BUTTON_STOCK_ADDTORECEIPT);
+    tap(TestId.BUTTON_RECEIPT_ROW1);
+    tap(TestId.BUTTON_EDIT_RETURNLINE);
+
+    tap(TestId.BUTTON_SEARCH);
+    write(TestId.FIELD_SEARCH_TEXT, "Solar charger");
+    tap(TestId.BUTTON_SEARCH_EXECUTE);
+    tap(TestId.BUTTON_SEARCHPRODUCT_SOLARCHARGER);
+    tap(TestId.BUTTON_STORE_STOCK);
+    tap(TestId.BUTTON_STORE_STOCK_ROW1);
+    tap(TestId.BUTTON_STOCK_ADDTORECEIPT);
+    tap(TestId.BUTTON_RECEIPT_ROW2);
+    tap(TestId.BUTTON_EDIT_RETURNLINE);
+
+    verify(TestId.LABEL_RECEIPT_ROW1_QTY, "-1");
+    verify(TestId.LABEL_RECEIPT_ROW2_QTY, "-1");
+
+    final String receiptNo = BackboneHelper.getDocumentNo();
+
+    tap(TestId.BUTTON_PAY);
+    tap(TestId.BUTTON_PAYMENT_CARD);
+    tap(TestId.BUTTON_PAY_EXACT);
+    tap(TestId.BUTTON_PAY_DONE);
+    verify(TestId.LABEL_TOTALTOPAY, "0.00");
+
+    final String sql = "select * from m_inoutline where m_inout_id in (select m_inout_id from m_inout where c_order_id in (select c_order_id from c_order where documentno='"
+        + receiptNo + "')) order by line";
+    new DatabaseHelperSelect() {
+      private int count = 0;
+
+      @Override
+      protected void yieldResultSet(final ResultSet rs) throws SQLException {
+        count++;
+        final String locatorId = rs.getString("m_locator_id");
+        final String productId = rs.getString("m_product_id");
+
+        logger.info(String.format(
+            "Verifying that the database record (%s) '%s' is one of the expected", locatorId,
+            productId));
+        switch (count) {
+        case 1:
+          assertThat("Line 1 - The product id is not one of the expected", productId,
+              equalTo("18C6723E5B53403D84D93D61F840FA30"));
+          assertThat("Line 1 - The locator id is not one of the expected", locatorId,
+              equalTo("4A8F85768FDD4B47BB3A468289C10A69"));
+          break;
+        case 2:
+          assertThat("Line 2 - The product id is not one of the expected", productId,
+              equalTo("12B5684B70BA4EAE93C3EA5DE38118A2"));
+          assertThat("The locator id is not one of the expected", locatorId,
+              equalTo("2D0CE7A3EAB5497A99ECAD359D96D468"));
+          break;
+        default:
+          throw new IllegalArgumentException("The returned resulset is missing the assertions");
+        }
+      }
+    }.execute(sql, 2);
+
+    SeleniumHelper
+        .executeScript("OB.MobileApp.model.get('permissions').OBPOS_warehouseselectionforline="
+            + whSelectionEnabled + ";");
+  }
+
+}
