0032097: Orderline Warehouse was not taken into account on Returns

diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -1048,9 +1048,14 @@
 
       if (negativeLine) {
         lineNo += 10;
+        Locator binForReturn = null;
+        if (orderLine.getWarehouse() != null && orderLine.getWarehouse().getReturnlocator() != null) {
+          binForReturn = orderLine.getWarehouse().getReturnlocator();
+        } else {
+          binForReturn = getBinForReturns(jsonorder.getString("posTerminal"));
+        }
         addShipmentline(shipment, shplineentity, orderlines.getJSONObject(i), orderLine, jsonorder,
-            lineNo, pendingQty.negate(), getBinForReturns(jsonorder.getString("posTerminal")),
-            null, i);
+            lineNo, pendingQty.negate(), binForReturn, null, i);
       } else if (useSingleBin) {
         lineNo += 10;
         addShipmentline(shipment, shplineentity, orderlines.getJSONObject(i), orderLine, jsonorder,

diff --git a/referencedata/sampledata/The_White_Valley_Group/FACT_ACCT.xml b/referencedata/sampledata/The_White_Valley_Group/FACT_ACCT.xml
--- a/referencedata/sampledata/The_White_Valley_Group/FACT_ACCT.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/FACT_ACCT.xml
@@ -7746,6 +7746,44 @@
 </FACT_ACCT>
 
 <FACT_ACCT>
+  <FACT_ACCT_ID><![CDATA[2B009321D0DF437299F6840F7556888C]]></FACT_ACCT_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:11:50.137993]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:11:50.137993]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ACCTSCHEMA_ID><![CDATA[AC1CF7D7135845709337B960AE4AC8A1]]></C_ACCTSCHEMA_ID>
+  <ACCOUNT_ID><![CDATA[D6B0178B58E54F37A5294390A49504EB]]></ACCOUNT_ID>
+  <DATETRX><![CDATA[2016-02-03 00:00:00.0]]></DATETRX>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+  <C_PERIOD_ID><![CDATA[D1BD6CAF0CC544FAB0E5FEB072845D23]]></C_PERIOD_ID>
+  <AD_TABLE_ID><![CDATA[321]]></AD_TABLE_ID>
+  <RECORD_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></RECORD_ID>
+  <LINE_ID><![CDATA[0F3DCFA0EB97455D9FC39B2D4EBCA936]]></LINE_ID>
+  <GL_CATEGORY_ID><![CDATA[FC670B83E59C4E7CBD6B999D3F28B251]]></GL_CATEGORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <POSTINGTYPE><![CDATA[A]]></POSTINGTYPE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMTSOURCEDR><![CDATA[3669.00]]></AMTSOURCEDR>
+  <AMTSOURCECR><![CDATA[0.00]]></AMTSOURCECR>
+  <AMTACCTDR><![CDATA[3669.00]]></AMTACCTDR>
+  <AMTACCTCR><![CDATA[0.00]]></AMTACCTCR>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTY><![CDATA[100]]></QTY>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <DESCRIPTION><![CDATA[03-02-2016 # 10]]></DESCRIPTION>
+  <FACT_ACCT_GROUP_ID><![CDATA[1DC5A8DA8F47436F9C1C5B0A0FE4F7AE]]></FACT_ACCT_GROUP_ID>
+  <SEQNO><![CDATA[10]]></SEQNO>
+  <FACTACCTTYPE><![CDATA[N]]></FACTACCTTYPE>
+  <DOCBASETYPE><![CDATA[MMI]]></DOCBASETYPE>
+  <ACCTVALUE><![CDATA[35000]]></ACCTVALUE>
+  <ACCTDESCRIPTION><![CDATA[Productos terminados A]]></ACCTDESCRIPTION>
+  <ISMODIFY><![CDATA[N]]></ISMODIFY>
+</FACT_ACCT>
+
+<FACT_ACCT>
   <FACT_ACCT_ID><![CDATA[2B707C22B35D4530A16766A496CE5876]]></FACT_ACCT_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
@@ -12929,6 +12967,44 @@
 </FACT_ACCT>
 
 <FACT_ACCT>
+  <FACT_ACCT_ID><![CDATA[4532BA25D3D8447D8633C52F5B39AF52]]></FACT_ACCT_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:11:50.137993]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:11:50.137993]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ACCTSCHEMA_ID><![CDATA[AC1CF7D7135845709337B960AE4AC8A1]]></C_ACCTSCHEMA_ID>
+  <ACCOUNT_ID><![CDATA[D6B0178B58E54F37A5294390A49504EB]]></ACCOUNT_ID>
+  <DATETRX><![CDATA[2016-02-03 00:00:00.0]]></DATETRX>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+  <C_PERIOD_ID><![CDATA[D1BD6CAF0CC544FAB0E5FEB072845D23]]></C_PERIOD_ID>
+  <AD_TABLE_ID><![CDATA[321]]></AD_TABLE_ID>
+  <RECORD_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></RECORD_ID>
+  <LINE_ID><![CDATA[5414B06F2DCC4548AF36D19A102F1D1B]]></LINE_ID>
+  <GL_CATEGORY_ID><![CDATA[FC670B83E59C4E7CBD6B999D3F28B251]]></GL_CATEGORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <POSTINGTYPE><![CDATA[A]]></POSTINGTYPE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMTSOURCEDR><![CDATA[2754.00]]></AMTSOURCEDR>
+  <AMTSOURCECR><![CDATA[0.00]]></AMTSOURCECR>
+  <AMTACCTDR><![CDATA[2754.00]]></AMTACCTDR>
+  <AMTACCTCR><![CDATA[0.00]]></AMTACCTCR>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTY><![CDATA[100]]></QTY>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <DESCRIPTION><![CDATA[03-02-2016 # 20]]></DESCRIPTION>
+  <FACT_ACCT_GROUP_ID><![CDATA[1DC5A8DA8F47436F9C1C5B0A0FE4F7AE]]></FACT_ACCT_GROUP_ID>
+  <SEQNO><![CDATA[30]]></SEQNO>
+  <FACTACCTTYPE><![CDATA[N]]></FACTACCTTYPE>
+  <DOCBASETYPE><![CDATA[MMI]]></DOCBASETYPE>
+  <ACCTVALUE><![CDATA[35000]]></ACCTVALUE>
+  <ACCTDESCRIPTION><![CDATA[Productos terminados A]]></ACCTDESCRIPTION>
+  <ISMODIFY><![CDATA[N]]></ISMODIFY>
+</FACT_ACCT>
+
+<FACT_ACCT>
   <FACT_ACCT_ID><![CDATA[45918D2C9CB34A928A1B286C3C6B85A8]]></FACT_ACCT_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[B5DE96143D6642228E3B9DEC69886A47]]></AD_ORG_ID>
@@ -30510,6 +30586,44 @@
 </FACT_ACCT>
 
 <FACT_ACCT>
+  <FACT_ACCT_ID><![CDATA[9C1D7111CA3C4CBFADF73A1CD7B976D4]]></FACT_ACCT_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:11:50.137993]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:11:50.137993]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ACCTSCHEMA_ID><![CDATA[AC1CF7D7135845709337B960AE4AC8A1]]></C_ACCTSCHEMA_ID>
+  <ACCOUNT_ID><![CDATA[E487A614C4EB465FAB8EC9CBAE31E943]]></ACCOUNT_ID>
+  <DATETRX><![CDATA[2016-02-03 00:00:00.0]]></DATETRX>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+  <C_PERIOD_ID><![CDATA[D1BD6CAF0CC544FAB0E5FEB072845D23]]></C_PERIOD_ID>
+  <AD_TABLE_ID><![CDATA[321]]></AD_TABLE_ID>
+  <RECORD_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></RECORD_ID>
+  <LINE_ID><![CDATA[5414B06F2DCC4548AF36D19A102F1D1B]]></LINE_ID>
+  <GL_CATEGORY_ID><![CDATA[FC670B83E59C4E7CBD6B999D3F28B251]]></GL_CATEGORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <POSTINGTYPE><![CDATA[A]]></POSTINGTYPE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMTSOURCEDR><![CDATA[0.00]]></AMTSOURCEDR>
+  <AMTSOURCECR><![CDATA[2754.00]]></AMTSOURCECR>
+  <AMTACCTDR><![CDATA[0.00]]></AMTACCTDR>
+  <AMTACCTCR><![CDATA[2754.00]]></AMTACCTCR>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTY><![CDATA[100]]></QTY>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <DESCRIPTION><![CDATA[03-02-2016 # 20]]></DESCRIPTION>
+  <FACT_ACCT_GROUP_ID><![CDATA[1DC5A8DA8F47436F9C1C5B0A0FE4F7AE]]></FACT_ACCT_GROUP_ID>
+  <SEQNO><![CDATA[40]]></SEQNO>
+  <FACTACCTTYPE><![CDATA[N]]></FACTACCTTYPE>
+  <DOCBASETYPE><![CDATA[MMI]]></DOCBASETYPE>
+  <ACCTVALUE><![CDATA[61000]]></ACCTVALUE>
+  <ACCTDESCRIPTION><![CDATA[Variación de existencias de mercaderías]]></ACCTDESCRIPTION>
+  <ISMODIFY><![CDATA[N]]></ISMODIFY>
+</FACT_ACCT>
+
+<FACT_ACCT>
   <FACT_ACCT_ID><![CDATA[9C371667D72145019543E970C8B02356]]></FACT_ACCT_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[01AD882EFC8545ACA6455E2F6FD51EE9]]></AD_ORG_ID>
@@ -35945,6 +36059,44 @@
 </FACT_ACCT>
 
 <FACT_ACCT>
+  <FACT_ACCT_ID><![CDATA[B7BF34ECB441491AA46F09CE2487F47C]]></FACT_ACCT_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:11:50.137993]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:11:50.137993]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ACCTSCHEMA_ID><![CDATA[AC1CF7D7135845709337B960AE4AC8A1]]></C_ACCTSCHEMA_ID>
+  <ACCOUNT_ID><![CDATA[E487A614C4EB465FAB8EC9CBAE31E943]]></ACCOUNT_ID>
+  <DATETRX><![CDATA[2016-02-03 00:00:00.0]]></DATETRX>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+  <C_PERIOD_ID><![CDATA[D1BD6CAF0CC544FAB0E5FEB072845D23]]></C_PERIOD_ID>
+  <AD_TABLE_ID><![CDATA[321]]></AD_TABLE_ID>
+  <RECORD_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></RECORD_ID>
+  <LINE_ID><![CDATA[0F3DCFA0EB97455D9FC39B2D4EBCA936]]></LINE_ID>
+  <GL_CATEGORY_ID><![CDATA[FC670B83E59C4E7CBD6B999D3F28B251]]></GL_CATEGORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <POSTINGTYPE><![CDATA[A]]></POSTINGTYPE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMTSOURCEDR><![CDATA[0.00]]></AMTSOURCEDR>
+  <AMTSOURCECR><![CDATA[3669.00]]></AMTSOURCECR>
+  <AMTACCTDR><![CDATA[0.00]]></AMTACCTDR>
+  <AMTACCTCR><![CDATA[3669.00]]></AMTACCTCR>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTY><![CDATA[100]]></QTY>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <DESCRIPTION><![CDATA[03-02-2016 # 10]]></DESCRIPTION>
+  <FACT_ACCT_GROUP_ID><![CDATA[1DC5A8DA8F47436F9C1C5B0A0FE4F7AE]]></FACT_ACCT_GROUP_ID>
+  <SEQNO><![CDATA[20]]></SEQNO>
+  <FACTACCTTYPE><![CDATA[N]]></FACTACCTTYPE>
+  <DOCBASETYPE><![CDATA[MMI]]></DOCBASETYPE>
+  <ACCTVALUE><![CDATA[61000]]></ACCTVALUE>
+  <ACCTDESCRIPTION><![CDATA[Variación de existencias de mercaderías]]></ACCTDESCRIPTION>
+  <ISMODIFY><![CDATA[N]]></ISMODIFY>
+</FACT_ACCT>
+
+<FACT_ACCT>
   <FACT_ACCT_ID><![CDATA[B82E2D4146824CF797397E9CC43710E7]]></FACT_ACCT_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_COSTING.xml b/referencedata/sampledata/The_White_Valley_Group/M_COSTING.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_COSTING.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_COSTING.xml
@@ -1620,6 +1620,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[2FF60A2C9A4F47F99ECA8150116AB95A]]></M_COSTING_ID>
+  <CREATED><![CDATA[2016-02-03 14:09:05.252]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.252]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2016-02-03 14:08:16.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[100]]></QTY>
+  <PRICE><![CDATA[36.69]]></PRICE>
+  <CUMQTY><![CDATA[300]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[36.69]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[18FCF30837A84C98B60CD3E92E4B6D88]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[305C764C6537441EBA121883C1F2A2A9]]></M_COSTING_ID>
   <CREATED><![CDATA[2015-11-26 11:52:05.294]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
@@ -7368,13 +7392,13 @@
   <M_COSTING_ID><![CDATA[C38D1ED641A143C48A8BAE7EBAAFD235]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:01:14.845]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:01:14.845]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.266]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
   <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
   <DATEFROM><![CDATA[2012-07-24 11:53:50.494]]></DATEFROM>
-  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <DATETO><![CDATA[2016-02-03 14:08:16.0]]></DATETO>
   <ISMANUAL><![CDATA[N]]></ISMANUAL>
   <QTY><![CDATA[100]]></QTY>
   <PRICE><![CDATA[36.69]]></PRICE>
@@ -8517,13 +8541,13 @@
   <M_COSTING_ID><![CDATA[E215C42A452F404A9FF24AA06EA50216]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:01:14.842]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:01:14.842]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.403]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
   <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
   <DATEFROM><![CDATA[2012-07-24 11:53:50.494]]></DATEFROM>
-  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <DATETO><![CDATA[2016-02-03 14:08:16.0]]></DATETO>
   <ISMANUAL><![CDATA[N]]></ISMANUAL>
   <QTY><![CDATA[300]]></QTY>
   <PRICE><![CDATA[27.54]]></PRICE>
@@ -9614,6 +9638,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[FC1487FB321D45E1BD4CFDEAC951D735]]></M_COSTING_ID>
+  <CREATED><![CDATA[2016-02-03 14:09:05.393]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.393]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2016-02-03 14:08:16.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[100]]></QTY>
+  <PRICE><![CDATA[27.54]]></PRICE>
+  <CUMQTY><![CDATA[700]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[27.54]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[871186AE27DD4164AEB2E459B0F0DCC8]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[FC1580DF06D3468B90E344967DD718DF]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:01:14.84]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_INVENTORY.xml b/referencedata/sampledata/The_White_Valley_Group/M_INVENTORY.xml
new file mode 100644
--- /dev/null
+++ b/referencedata/sampledata/The_White_Valley_Group/M_INVENTORY.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<M_INVENTORY>
+  <M_INVENTORY_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></M_INVENTORY_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:07:35.743]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:11:50.150166]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <NAME><![CDATA[03-02-2016]]></NAME>
+  <M_WAREHOUSE_ID><![CDATA[CE7AB151695342FF879938F837F12E6E]]></M_WAREHOUSE_ID>
+  <MOVEMENTDATE><![CDATA[2016-02-03 00:00:00.0]]></MOVEMENTDATE>
+  <POSTED><![CDATA[Y]]></POSTED>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
+  <GENERATELIST><![CDATA[N]]></GENERATELIST>
+  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+</M_INVENTORY>
+
+</data>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_INVENTORYLINE.xml b/referencedata/sampledata/The_White_Valley_Group/M_INVENTORYLINE.xml
new file mode 100644
--- /dev/null
+++ b/referencedata/sampledata/The_White_Valley_Group/M_INVENTORYLINE.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<M_INVENTORYLINE>
+  <M_INVENTORYLINE_ID><![CDATA[0F3DCFA0EB97455D9FC39B2D4EBCA936]]></M_INVENTORYLINE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:07:55.092]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:07:55.092]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <M_INVENTORY_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></M_INVENTORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <LINE><![CDATA[10]]></LINE>
+  <QTYBOOK><![CDATA[0]]></QTYBOOK>
+  <QTYCOUNT><![CDATA[100]]></QTYCOUNT>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+</M_INVENTORYLINE>
+
+<M_INVENTORYLINE>
+  <M_INVENTORYLINE_ID><![CDATA[5414B06F2DCC4548AF36D19A102F1D1B]]></M_INVENTORYLINE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:08:13.643]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:08:13.643]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <M_INVENTORY_ID><![CDATA[18FA2628578443FA92C406DFD6C73A85]]></M_INVENTORY_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <LINE><![CDATA[20]]></LINE>
+  <QTYBOOK><![CDATA[0]]></QTYBOOK>
+  <QTYCOUNT><![CDATA[100]]></QTYCOUNT>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+</M_INVENTORYLINE>
+
+</data>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_STORAGE_DETAIL.xml b/referencedata/sampledata/The_White_Valley_Group/M_STORAGE_DETAIL.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_STORAGE_DETAIL.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_STORAGE_DETAIL.xml
@@ -495,6 +495,26 @@
 </M_STORAGE_DETAIL>
 
 <M_STORAGE_DETAIL>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTYONHAND><![CDATA[100]]></QTYONHAND>
+  <DATELASTINVENTORY><![CDATA[2016-02-03 00:00:00.0]]></DATELASTINVENTORY>
+  <PREQTYONHAND><![CDATA[0]]></PREQTYONHAND>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:07:55.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <M_STORAGE_DETAIL_ID><![CDATA[16831BA1C51E4CDF89C2739B1FA403BC]]></M_STORAGE_DETAIL_ID>
+  <RESERVEDQTY><![CDATA[0]]></RESERVEDQTY>
+  <ALLOCATEDQTY><![CDATA[0]]></ALLOCATEDQTY>
+</M_STORAGE_DETAIL>
+
+<M_STORAGE_DETAIL>
   <M_PRODUCT_ID><![CDATA[AC79520FEB4743B3AAA379BF70B9B7DA]]></M_PRODUCT_ID>
   <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
@@ -1331,6 +1351,26 @@
 </M_STORAGE_DETAIL>
 
 <M_STORAGE_DETAIL>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <QTYONHAND><![CDATA[100]]></QTYONHAND>
+  <DATELASTINVENTORY><![CDATA[2016-02-03 00:00:00.0]]></DATELASTINVENTORY>
+  <PREQTYONHAND><![CDATA[0]]></PREQTYONHAND>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:08:13.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <M_STORAGE_DETAIL_ID><![CDATA[36286FBA765848FC82F608D8D39156CF]]></M_STORAGE_DETAIL_ID>
+  <RESERVEDQTY><![CDATA[0]]></RESERVEDQTY>
+  <ALLOCATEDQTY><![CDATA[0]]></ALLOCATEDQTY>
+</M_STORAGE_DETAIL>
+
+<M_STORAGE_DETAIL>
   <M_PRODUCT_ID><![CDATA[158F7969866D4E81AC5B03547AABF45A]]></M_PRODUCT_ID>
   <M_LOCATOR_ID><![CDATA[FDC4AC6020F841B3BAA73048C5EA7180]]></M_LOCATOR_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION.xml b/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION.xml
@@ -1231,6 +1231,36 @@
 </M_TRANSACTION>
 
 <M_TRANSACTION>
+  <M_TRANSACTION_ID><![CDATA[18FCF30837A84C98B60CD3E92E4B6D88]]></M_TRANSACTION_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:08:16.720022]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.331]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_PRODUCT_ID><![CDATA[18C6723E5B53403D84D93D61F840FA30]]></M_PRODUCT_ID>
+  <MOVEMENTDATE><![CDATA[2016-02-03 00:00:00.0]]></MOVEMENTDATE>
+  <MOVEMENTQTY><![CDATA[100]]></MOVEMENTQTY>
+  <M_INVENTORYLINE_ID><![CDATA[0F3DCFA0EB97455D9FC39B2D4EBCA936]]></M_INVENTORYLINE_ID>
+  <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[3669.00]]></TRANSACTIONCOST>
+  <TRXPROCESSDATE><![CDATA[2016-02-03 14:08:16.0]]></TRXPROCESSDATE>
+  <M_COSTING_ALGORITHM_ID><![CDATA[B069080A0AE149A79CF1FA0E24F16AB6]]></M_COSTING_ALGORITHM_ID>
+  <ISCOSTCALCULATED><![CDATA[Y]]></ISCOSTCALCULATED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <COSTING_STATUS><![CDATA[CC]]></COSTING_STATUS>
+  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
+  <ISPROCESSED><![CDATA[Y]]></ISPROCESSED>
+  <CHECKPRICEDIFFERENCE><![CDATA[N]]></CHECKPRICEDIFFERENCE>
+  <MANUALCOSTADJUSTMENT><![CDATA[N]]></MANUALCOSTADJUSTMENT>
+  <ISCOSTPERMANENT><![CDATA[N]]></ISCOSTPERMANENT>
+</M_TRANSACTION>
+
+<M_TRANSACTION>
   <M_TRANSACTION_ID><![CDATA[1900DDEF136749C0B653F1CCD0D4F8C3]]></M_TRANSACTION_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[01AD882EFC8545ACA6455E2F6FD51EE9]]></AD_ORG_ID>
@@ -6241,6 +6271,36 @@
 </M_TRANSACTION>
 
 <M_TRANSACTION>
+  <M_TRANSACTION_ID><![CDATA[871186AE27DD4164AEB2E459B0F0DCC8]]></M_TRANSACTION_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-02-03 14:08:16.720022]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.418]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
+  <M_LOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_LOCATOR_ID>
+  <M_PRODUCT_ID><![CDATA[12B5684B70BA4EAE93C3EA5DE38118A2]]></M_PRODUCT_ID>
+  <MOVEMENTDATE><![CDATA[2016-02-03 00:00:00.0]]></MOVEMENTDATE>
+  <MOVEMENTQTY><![CDATA[100]]></MOVEMENTQTY>
+  <M_INVENTORYLINE_ID><![CDATA[5414B06F2DCC4548AF36D19A102F1D1B]]></M_INVENTORYLINE_ID>
+  <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
+  <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[2754.00]]></TRANSACTIONCOST>
+  <TRXPROCESSDATE><![CDATA[2016-02-03 14:08:16.0]]></TRXPROCESSDATE>
+  <M_COSTING_ALGORITHM_ID><![CDATA[B069080A0AE149A79CF1FA0E24F16AB6]]></M_COSTING_ALGORITHM_ID>
+  <ISCOSTCALCULATED><![CDATA[Y]]></ISCOSTCALCULATED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <COSTING_STATUS><![CDATA[CC]]></COSTING_STATUS>
+  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
+  <ISPROCESSED><![CDATA[Y]]></ISPROCESSED>
+  <CHECKPRICEDIFFERENCE><![CDATA[N]]></CHECKPRICEDIFFERENCE>
+  <MANUALCOSTADJUSTMENT><![CDATA[N]]></MANUALCOSTADJUSTMENT>
+  <ISCOSTPERMANENT><![CDATA[N]]></ISCOSTPERMANENT>
+</M_TRANSACTION>
+
+<M_TRANSACTION>
   <M_TRANSACTION_ID><![CDATA[88F0AD4DC1484BE38F026A79A19FA292]]></M_TRANSACTION_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION_COST.xml b/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION_COST.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION_COST.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_TRANSACTION_COST.xml
@@ -1344,6 +1344,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[3213BAB2CDA2410F93F234A6A1A53A9A]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-02-03 14:09:05.256]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.256]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[18FCF30837A84C98B60CD3E92E4B6D88]]></M_TRANSACTION_ID>
+  <COST><![CDATA[3669.00]]></COST>
+  <COSTDATE><![CDATA[2016-02-03 14:08:16.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[333B6F2A800D4807A81A5D03F6D95266]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[3B187EC130A549A7A9388F8060EF156D]]></AD_ORG_ID>
@@ -3690,6 +3707,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[843C120C20AC4D43B9B65DD2F0F57C21]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[D270A5AC50874F8BA67A88EE977F8E3B]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-02-03 14:09:05.396]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:09:05.396]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[871186AE27DD4164AEB2E459B0F0DCC8]]></M_TRANSACTION_ID>
+  <COST><![CDATA[2754.00]]></COST>
+  <COSTDATE><![CDATA[2016-02-03 14:08:16.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2016-02-03 00:00:00.0]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[851ED39C02BC43E9979B8BAB1D86E76E]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[3B187EC130A549A7A9388F8060EF156D]]></AD_ORG_ID>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_WAREHOUSE.xml b/referencedata/sampledata/The_White_Valley_Group/M_WAREHOUSE.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_WAREHOUSE.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_WAREHOUSE.xml
@@ -58,13 +58,14 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:01:13.699]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:01:13.699]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:10:38.882]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <VALUE><![CDATA[VBS/001]]></VALUE>
   <NAME><![CDATA[Vall Blanca Store Warehouse]]></NAME>
   <C_LOCATION_ID><![CDATA[53831A9B6EA64EE79FD98E6A41A44287]]></C_LOCATION_ID>
   <SEPARATOR><![CDATA[*]]></SEPARATOR>
   <ISSHIPPER><![CDATA[N]]></ISSHIPPER>
+  <M_RETURNLOCATOR_ID><![CDATA[2D0CE7A3EAB5497A99ECAD359D96D468]]></M_RETURNLOCATOR_ID>
   <ISALLOCATED><![CDATA[N]]></ISALLOCATED>
 </M_WAREHOUSE>
 
@@ -109,13 +110,14 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:01:13.726]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:01:13.726]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-02-03 14:08:26.55]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <VALUE><![CDATA[WVS/001]]></VALUE>
   <NAME><![CDATA[White Valley Spain Distribution Center]]></NAME>
   <C_LOCATION_ID><![CDATA[F7029BEA56CD443EB991B5E25FD9DBA4]]></C_LOCATION_ID>
   <SEPARATOR><![CDATA[*]]></SEPARATOR>
   <ISSHIPPER><![CDATA[N]]></ISSHIPPER>
+  <M_RETURNLOCATOR_ID><![CDATA[4A8F85768FDD4B47BB3A468289C10A69]]></M_RETURNLOCATOR_ID>
   <ISALLOCATED><![CDATA[N]]></ISALLOCATED>
 </M_WAREHOUSE>
 

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 + ";");
+  }
+
+}