[ChangePassword] Merge with actual pi
authorJonathan Bueno <jonathan.bueno@openbravo.com>
Mon, 21 Dec 2015 16:26:08 +0100
changeset 28780 be05b136c217
parent 28779 f4ffc58ee796 (current diff)
parent 28475 1b4cba742662 (diff)
child 28781 a8105d7b8e40
[ChangePassword] Merge with actual pi
lib/runtime/commons-io-2.0.1.jar
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src/org/openbravo/base/secureApp/LoginHandler.java
src/org/openbravo/base/secureApp/LoginUtils.java
src/org/openbravo/erpCommon/security/Login.html
--- a/.hgignore	Mon Dec 21 16:15:13 2015 +0100
+++ b/.hgignore	Mon Dec 21 16:26:08 2015 +0100
@@ -44,5 +44,3 @@
 
 sources
 scripts
-
-modules/org.bpmc
--- a/.hgsigs	Mon Dec 21 16:15:13 2015 +0100
+++ b/.hgsigs	Mon Dec 21 16:26:08 2015 +0100
@@ -176,5 +176,11 @@
 906c7a47100c5694d720f6a00a8d205538562334 0 iEYEABECAAYFAlW3GiEACgkQCX/oGf+2qkNk4gCfVlZA1GqR2LvJwBPBXoMn6RCRyFYAnA4aPF+fOZXRpAqKMRT55nvswuRI
 6dfd2fade034c7225367366dc34dcf402b596555 0 iEYEABECAAYFAlXccLwACgkQCX/oGf+2qkPEMQCeM4MxdgXlCtbu0xqZNcX0IAEuGZgAnAjQlB4gOw0q84Q/gFyRL38jkahJ
 9f4a209cc84b3b4e7f3176388f6d6071779ac3e2 0 iEYEABECAAYFAlX5YqQACgkQCX/oGf+2qkOLNwCgr9InQrxWVMHG2e7sabvZBm3KD6gAoPvoMDHktqqkv2Qqtbv3G1mqpTrM
+f22b32ad49b1baca7b310bdf68d8d411e897f7bf 0 iEYEABECAAYFAlYtwHYACgkQCX/oGf+2qkOQ1QCgsBVLaaNfILpxAYrZfhBD+GDVVLEAnREcCa1Lvzf4mJ8eD8VWTx1g8kqk
 73f7d3c67dc7d6063af1dac6e71db12b9081150a 0 iEYEABECAAYFAlXMHl0ACgkQCX/oGf+2qkNVuACfTfB6/RfeioYrYtsi81kAwADW0lgAoOJdXKScLwl6RHeXIFvMlrzlcT6w
 f8b98762376a89ec93a0a623c61fdab00975c3a9 0 iEYEABECAAYFAlXtQ4gACgkQCX/oGf+2qkMZUgCePOnen6iguLqaG+86NeCC8Hr0yzAAoKTnw/BIXyBm5Ski5JQT/0mF1zHK
+9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM
+d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ
+089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ
+d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo
+cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv
--- a/.hgtags	Mon Dec 21 16:15:13 2015 +0100
+++ b/.hgtags	Mon Dec 21 16:26:08 2015 +0100
@@ -187,5 +187,11 @@
 01405101d810eaafec106bab50ce31b41df52569 3.0PR15Q2.3
 d26c43a861dec9147a6a60d8aca52359837e9591 3.0PR15Q2.4
 f38025d616fa8a50a95d0dd3a3c38bcf6bbce053 3.0PR15Q2.5
+8b094ef73876cad67e35345c1add17266413af46 3.0PR15Q2.6
 828faf1939944cd8d55d562494138f68305c5b50 3.0PR15Q3
 e5863950c81de2bcf7dce57035094e96d544a9ae 3.0PR15Q3.1
+9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2
+bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3
+8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4
+84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4
+f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1
--- a/build.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/build.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -554,13 +554,29 @@
   </target>
 
   <target name="generate.java.doc">
-    <javadoc sourcepath="${base.src}:${base.src.test}:${build.AD}:${base.src.core}/src:${base.src.gen}:build/javasqlc/src/:build/javasqlc/srcAD" Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" linksource="no" maxmemory="1024M">
+    <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M">
+      <sourcepath>
+        <pathelement path="${base.src}" />
+        <pathelement path="${base.src.test}/src" />
+        <pathelement path="${build.AD}" />
+        <pathelement path="${base.src.core}/src" />
+        <pathelement path="${base.src.gen}" />
+        <pathelement path="build/javasqlc/src" />
+        <pathelement path="build/javasqlc/srcAD" />
+        <dirset dir="${base.modules}">
+          <include name="*/src" />
+          <include name="*/src-test" />
+        </dirset>
+      </sourcepath>
       <excludepackage name="org.openbravo.erpWindows.*"/>
       <classpath>
         <path refid="project.class.path"/>
         <pathelement path="lib/build/js.jar" />
+        <fileset dir="${base.modules}">
+          <include name="*/lib/test/*.jar" />
+        </fileset>
       </classpath>
-      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
     </javadoc>
   </target>
 
--- a/legal/Licensing.txt	Mon Dec 21 16:15:13 2015 +0100
+++ b/legal/Licensing.txt	Mon Dec 21 16:26:08 2015 +0100
@@ -107,7 +107,7 @@
 # commons-dbcp-1.4.jar
 # commons-digester-1.8.1.jar
 # commons-fileupload-1.2.2.jar
-# commons-io-2.0.1.jar
+# commons-io-2.4.jar
 # commons-lang-2.6.jar
 # commons-logging-1.1.1.jar
 # commons-pool-1.5.6.jar
Binary file lib/runtime/commons-io-2.0.1.jar has changed
Binary file lib/runtime/commons-io-2.4.jar has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -204,7 +204,8 @@
       WHERE ps.fin_payment_schedule_id = psd.fin_payment_schedule_order
         AND ps.c_order_id = p_record_id
         AND psd.fin_payment_detail_id = pd.fin_payment_detail_id
-        AND pd.fin_payment_id = p.fin_payment_id;
+        AND pd.fin_payment_id = p.fin_payment_id
+        AND p.status <> 'RPAP';
       IF (v_count <> 0) THEN
         RAISE_APPLICATION_ERROR(-20000, '@APRM_OrderWithPayments@'||v_DocumentNo);
       END IF;
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -4051,6 +4051,7 @@
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ENTITY_ALIAS><![CDATA[fat]]></ENTITY_ALIAS>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D--></AD_COLUMN>
 
 <!--7C947F020859452883746030218158E0--><AD_COLUMN>
@@ -6532,6 +6533,41 @@
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--93E0298CEA7A446B863D7D3456A1157E--></AD_COLUMN>
 
+<!--952500641B5A4EC8883B5204EC4870ED--><AD_COLUMN>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_COLUMN_ID><![CDATA[952500641B5A4EC8883B5204EC4870ED]]></AD_COLUMN_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <NAME><![CDATA[Bpartnername]]></NAME>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <DESCRIPTION><![CDATA[Business Partner Name]]></DESCRIPTION>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <HELP><![CDATA[Business Partner Name]]></HELP>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <COLUMNNAME><![CDATA[Bpartnername]]></COLUMNNAME>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_ELEMENT_ID><![CDATA[8189F49FFECC6E56E040007F01003E83]]></AD_ELEMENT_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ENTITY_ALIAS><![CDATA[bsl.bpartnername]]></ENTITY_ALIAS>
+<!--952500641B5A4EC8883B5204EC4870ED--></AD_COLUMN>
+
 <!--96221416E24540059B9BEFEC5F09D3FF--><AD_COLUMN>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <AD_COLUMN_ID><![CDATA[96221416E24540059B9BEFEC5F09D3FF]]></AD_COLUMN_ID>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8698,6 +8734,7 @@
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ENTITY_ALIAS><![CDATA[bsl.updated]]></ENTITY_ALIAS>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0--></AD_COLUMN>
 
 <!--A7AA3F7ABB27453795B97A175662F61A--><AD_COLUMN>
@@ -9076,6 +9113,7 @@
 <!--B15C117EB160403FABAC34188650DAC6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--B15C117EB160403FABAC34188650DAC6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--B15C117EB160403FABAC34188650DAC6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B15C117EB160403FABAC34188650DAC6-->  <ENTITY_ALIAS><![CDATA[bsl.matchedDocument]]></ENTITY_ALIAS>
 <!--B15C117EB160403FABAC34188650DAC6--></AD_COLUMN>
 
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6--><AD_COLUMN>
@@ -10026,6 +10064,7 @@
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ENTITY_ALIAS><![CDATA[bsl.description]]></ENTITY_ALIAS>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9--></AD_COLUMN>
 
 <!--C72EC790B2EF4BEEA2A843D30770B85D--><AD_COLUMN>
@@ -10341,6 +10380,41 @@
 <!--D9CE146DA825427A9F0132F13599424B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D9CE146DA825427A9F0132F13599424B--></AD_COLUMN>
 
+<!--DB65D341BFA24AC697482DCCE1731C6A--><AD_COLUMN>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_COLUMN_ID><![CDATA[DB65D341BFA24AC697482DCCE1731C6A]]></AD_COLUMN_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <NAME><![CDATA[fatDescription]]></NAME>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <COLUMNNAME><![CDATA[fatDescription]]></COLUMNNAME>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ENTITY_ALIAS><![CDATA[fat.description]]></ENTITY_ALIAS>
+<!--DB65D341BFA24AC697482DCCE1731C6A--></AD_COLUMN>
+
 <!--E156A67751484C5A9D367C235769BB24--><AD_COLUMN>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_COLUMN_ID><![CDATA[E156A67751484C5A9D367C235769BB24]]></AD_COLUMN_ID>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11077,7 +11151,7 @@
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ENTITY_ALIAS><![CDATA[affinity]]></ENTITY_ALIAS>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ENTITY_ALIAS><![CDATA[bsl.matchingtype]]></ENTITY_ALIAS>
 <!--FE24DEE7950D47A68BD883DF1F7BA506--></AD_COLUMN>
 
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8--><AD_COLUMN>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6440,6 +6440,34 @@
 <!--5826408A05044E458F0DCFDB9696C82C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5826408A05044E458F0DCFDB9696C82C--></AD_FIELD>
 
+<!--58D6982C3BD046EB831A9D61095B763F--><AD_FIELD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_FIELD_ID><![CDATA[58D6982C3BD046EB831A9D61095B763F]]></AD_FIELD_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <NAME><![CDATA[Transaction Description]]></NAME>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_COLUMN_ID><![CDATA[DB65D341BFA24AC697482DCCE1731C6A]]></AD_COLUMN_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--58D6982C3BD046EB831A9D61095B763F--></AD_FIELD>
+
 <!--58DEB15AC19842A9AE2D92B136A040E2--><AD_FIELD>
 <!--58DEB15AC19842A9AE2D92B136A040E2-->  <AD_FIELD_ID><![CDATA[58DEB15AC19842A9AE2D92B136A040E2]]></AD_FIELD_ID>
 <!--58DEB15AC19842A9AE2D92B136A040E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8632,6 +8660,34 @@
 <!--797FE216F70D4B318CEB1FE6C1EA7B5E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--797FE216F70D4B318CEB1FE6C1EA7B5E--></AD_FIELD>
 
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C--><AD_FIELD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_FIELD_ID><![CDATA[7985E4F3C77F40DEB85E9BBDBACCD28C]]></AD_FIELD_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <NAME><![CDATA[Business Partner Name]]></NAME>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <DESCRIPTION><![CDATA[Business Partner Name]]></DESCRIPTION>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <HELP><![CDATA[Business Partner Name]]></HELP>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_COLUMN_ID><![CDATA[952500641B5A4EC8883B5204EC4870ED]]></AD_COLUMN_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C--></AD_FIELD>
+
 <!--7A169944D6C3486EBB925F5C3E5F9830--><AD_FIELD>
 <!--7A169944D6C3486EBB925F5C3E5F9830-->  <AD_FIELD_ID><![CDATA[7A169944D6C3486EBB925F5C3E5F9830]]></AD_FIELD_ID>
 <!--7A169944D6C3486EBB925F5C3E5F9830-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -649,6 +649,18 @@
 <!--712C841E501642B881A998CCAC13E420-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--712C841E501642B881A998CCAC13E420--></AD_MESSAGE>
 
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4--><AD_MESSAGE>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <AD_MESSAGE_ID><![CDATA[76D4A0740BAD4274B8718A0AF2A1C9B4]]></AD_MESSAGE_ID>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <VALUE><![CDATA[APRM_ErrorOnUnmatchingRecords]]></VALUE>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <MSGTEXT><![CDATA[%0 record(s) failed. Reference No.: ]]></MSGTEXT>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--76D4A0740BAD4274B8718A0AF2A1C9B4--></AD_MESSAGE>
+
 <!--7918E1E75DF84F499AD21A51F53F9A9B--><AD_MESSAGE>
 <!--7918E1E75DF84F499AD21A51F53F9A9B-->  <AD_MESSAGE_ID><![CDATA[7918E1E75DF84F499AD21A51F53F9A9B]]></AD_MESSAGE_ID>
 <!--7918E1E75DF84F499AD21A51F53F9A9B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1381,6 +1393,18 @@
 <!--DF6BD33E986149C0ADE4D0CC45D7394C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--DF6BD33E986149C0ADE4D0CC45D7394C--></AD_MESSAGE>
 
+<!--E103F874F07D44269B98F457EFCAF367--><AD_MESSAGE>
+<!--E103F874F07D44269B98F457EFCAF367-->  <AD_MESSAGE_ID><![CDATA[E103F874F07D44269B98F457EFCAF367]]></AD_MESSAGE_ID>
+<!--E103F874F07D44269B98F457EFCAF367-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E103F874F07D44269B98F457EFCAF367-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E103F874F07D44269B98F457EFCAF367-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E103F874F07D44269B98F457EFCAF367-->  <VALUE><![CDATA[APRM_UnmatchedRecords]]></VALUE>
+<!--E103F874F07D44269B98F457EFCAF367-->  <MSGTEXT><![CDATA[%0 record(s) were properly unmatched.]]></MSGTEXT>
+<!--E103F874F07D44269B98F457EFCAF367-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E103F874F07D44269B98F457EFCAF367-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E103F874F07D44269B98F457EFCAF367-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--E103F874F07D44269B98F457EFCAF367--></AD_MESSAGE>
+
 <!--E217A4F4BDE84DC6A95ACB3F54549FDD--><AD_MESSAGE>
 <!--E217A4F4BDE84DC6A95ACB3F54549FDD-->  <AD_MESSAGE_ID><![CDATA[E217A4F4BDE84DC6A95ACB3F54549FDD]]></AD_MESSAGE_ID>
 <!--E217A4F4BDE84DC6A95ACB3F54549FDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1405,6 +1429,18 @@
 <!--E92C3899BD924A5C991A39B2CDA74D29-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--E92C3899BD924A5C991A39B2CDA74D29--></AD_MESSAGE>
 
+<!--EAA6B599637E4A909131395D843C3C61--><AD_MESSAGE>
+<!--EAA6B599637E4A909131395D843C3C61-->  <AD_MESSAGE_ID><![CDATA[EAA6B599637E4A909131395D843C3C61]]></AD_MESSAGE_ID>
+<!--EAA6B599637E4A909131395D843C3C61-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EAA6B599637E4A909131395D843C3C61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EAA6B599637E4A909131395D843C3C61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EAA6B599637E4A909131395D843C3C61-->  <VALUE><![CDATA[APRM_NoFinancialAccountAvailable]]></VALUE>
+<!--EAA6B599637E4A909131395D843C3C61-->  <MSGTEXT><![CDATA[It does not exist any Financial Account available for this Payment Method]]></MSGTEXT>
+<!--EAA6B599637E4A909131395D843C3C61-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--EAA6B599637E4A909131395D843C3C61-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--EAA6B599637E4A909131395D843C3C61-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--EAA6B599637E4A909131395D843C3C61--></AD_MESSAGE>
+
 <!--EDEA16A966B94F63A7C1E339FC095B08--><AD_MESSAGE>
 <!--EDEA16A966B94F63A7C1E339FC095B08-->  <AD_MESSAGE_ID><![CDATA[EDEA16A966B94F63A7C1E339FC095B08]]></AD_MESSAGE_ID>
 <!--EDEA16A966B94F63A7C1E339FC095B08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.28148]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -343,6 +343,18 @@
 <!--7AC4F4FF644247B7BD320BBF67C4F066-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--7AC4F4FF644247B7BD320BBF67C4F066--></AD_REF_LIST>
 
+<!--94334E10107D4F3C868191FF2C9AEAD0--><AD_REF_LIST>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <AD_REF_LIST_ID><![CDATA[94334E10107D4F3C868191FF2C9AEAD0]]></AD_REF_LIST_ID>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <VALUE><![CDATA[UN]]></VALUE>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <NAME><![CDATA[Unmatch Selected]]></NAME>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--94334E10107D4F3C868191FF2C9AEAD0-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--94334E10107D4F3C868191FF2C9AEAD0--></AD_REF_LIST>
+
 <!--9AE9EBD541F34CC7AC8830B9601C52CB--><AD_REF_LIST>
 <!--9AE9EBD541F34CC7AC8830B9601C52CB-->  <AD_REF_LIST_ID><![CDATA[9AE9EBD541F34CC7AC8830B9601C52CB]]></AD_REF_LIST_ID>
 <!--9AE9EBD541F34CC7AC8830B9601C52CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -466,7 +478,7 @@
 <!--C69982184F634AC79728338D1F327B76-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C69982184F634AC79728338D1F327B76-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C69982184F634AC79728338D1F327B76-->  <VALUE><![CDATA[RE]]></VALUE>
-<!--C69982184F634AC79728338D1F327B76-->  <NAME><![CDATA[Reconcile]]></NAME>
+<!--C69982184F634AC79728338D1F327B76-->  <NAME><![CDATA[Reconcile All]]></NAME>
 <!--C69982184F634AC79728338D1F327B76-->  <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID>
 <!--C69982184F634AC79728338D1F327B76-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C69982184F634AC79728338D1F327B76-->  <SEQNO><![CDATA[20]]></SEQNO>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -916,10 +916,11 @@
 <!--ED54A4E24196476596955286D403461E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--ED54A4E24196476596955286D403461E-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--ED54A4E24196476596955286D403461E-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.MatchStatement.selectionChanged]]></EM_OBUIAPP_SELECTION>
 <!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT>
-<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE>
 <!--ED54A4E24196476596955286D403461E--></AD_TAB>
 
 <!--F6C2283A21314407BBBB23FF14B85ED4--><AD_TAB>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -205,10 +205,10 @@
 <!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--BC21981DCF0846338D631887BEDFE7FA-->  <DATAORIGINTYPE><![CDATA[HQL]]></DATAORIGINTYPE>
 <!--BC21981DCF0846338D631887BEDFE7FA-->  <ISTREE><![CDATA[N]]></ISTREE>
-<!--BC21981DCF0846338D631887BEDFE7FA-->  <HQLQUERY><![CDATA[select bsl.transactionDate as banklineDate, case when bp is null then bsl.bpartnername  else bp.name end AS businessPartner, bsl.referenceNo as referenceNo, bsl.cramount - bsl.dramount as amount, bsl.id as match, bsl.matchingtype as affinity, 
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <HQLQUERY><![CDATA[select bsl.transactionDate as banklineDate, case when bp is null then bsl.bpartnername  else bp.name end AS businessPartner, bsl.bpartnername AS Bpartnername, bsl.referenceNo as referenceNo, bsl.cramount - bsl.dramount as amount, bsl.id as match, bsl.matchingtype as affinity, 
 case when fat is null then false else true end AS cleared,
 bsl.matchingtype as matchingtype, bsl.id as id, 
-fat.transactionDate as trxDate, transactionBP.name as transactionBPName, fat.depositAmount - fat.paymentAmount as transactionAmount, bsl.lineNo as lineNo, fat as fin_finacc_transaction_id, bsl.description, case when bsl.cramount - bsl.dramount >0 then 'D' else 'P' end as type, bsl.matchedDocument, transactionGLItem.name as transactionGLItemName, glitem.name as glitemName, bsl.updated as bslUpdated
+fat.transactionDate as trxDate, transactionBP.name as transactionBPName, fat.depositAmount - fat.paymentAmount as transactionAmount, bsl.lineNo as lineNo, fat as fin_finacc_transaction_id, bsl.description as description, fat.description as fatDescription, case when bsl.cramount - bsl.dramount >0 then 'D' else 'P' end as type, bsl.matchedDocument as matchedDocument, transactionGLItem.name as transactionGLItemName, glitem.name as glitemName, bsl.updated as bslUpdated
  @selectClause@
 from FIN_BankStatementLine as bsl
  join bsl.bankStatement as bs
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -281,7 +281,8 @@
             strDocBaseType, org.getId(), OBDateUtils.formatDate(paymentDate))
         && orgLegalWithAccounting) {
       String messag = OBMessageUtils.messageBD("PeriodNotAvailable");
-      throw new OBException(messag);
+      log.debug(messag);
+      throw new OBException(messag, false);
     }
 
     String strPaymentAmount = "0";
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -26,6 +26,7 @@
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.financial.FinancialUtils;
@@ -119,14 +120,19 @@
 
   private FinAccPaymentMethod getFinancialAccountPaymentMethod(String paymentMethodId,
       String financialAccountId) {
-    OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria(
-        FinAccPaymentMethod.class);
-    obc.setFilterOnReadableOrganization(false);
-    obc.setMaxResults(1);
-    obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT,
-        OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId)));
-    obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
-        OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId)));
-    return (FinAccPaymentMethod) obc.uniqueResult();
+    OBContext.setAdminMode(true);
+    try {
+      OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria(
+          FinAccPaymentMethod.class);
+      obc.setFilterOnReadableOrganization(false);
+      obc.setMaxResults(1);
+      obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT,
+          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId)));
+      obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
+          OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId)));
+      return (FinAccPaymentMethod) obc.uniqueResult();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
   }
 }
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -0,0 +1,151 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (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) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  Cleardrop_____________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.advpaymentmngt.utility.APRM_MatchingUtility;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBDateUtils;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+import org.openbravo.service.db.DbUtility;
+import org.openbravo.service.json.JsonUtils;
+import org.openbravo.service.json.OBStaleObjectException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UnMatchSelectedTransactionsActionHandler extends BaseActionHandler {
+  private static final Logger log = LoggerFactory
+      .getLogger(UnMatchSelectedTransactionsActionHandler.class);
+
+  @Override
+  protected JSONObject execute(Map<String, Object> parameters, String data) {
+    JSONObject result = new JSONObject();
+    JSONObject errorMessage = new JSONObject();
+    try {
+      OBContext.setAdminMode(true);
+      final JSONObject jsonData = new JSONObject(data);
+      SimpleDateFormat xmlDateTimeFormat = JsonUtils.createJSTimeFormat();
+
+      List<String> errorLines = new ArrayList<String>();
+
+      final JSONArray bankStatementLineIds = jsonData.getJSONArray("bankStatementLineIds");
+      int bankStatementLineIdsLength = bankStatementLineIds != null ? bankStatementLineIds.length()
+          : 0;
+      int alreadyCleared = 0;
+      for (int i = 0; i < bankStatementLineIdsLength; i++) {
+        JSONObject bankStatementLine = bankStatementLineIds.getJSONObject(i);
+        if (!bankStatementLine.getBoolean("cleared")) {
+          log.info("Skipping " + bankStatementLine.getString("referenceNo")
+              + " line as it's not matched");
+          alreadyCleared++;
+        } else {
+          try {
+            Date date = xmlDateTimeFormat.parse(bankStatementLine.getString("bslUpdated"));
+            final FIN_BankStatementLine bsline = OBDal.getInstance().get(
+                FIN_BankStatementLine.class, bankStatementLine.getString("id"));
+            Date bbddBSLUpdated = bsline.getUpdated();
+            // Remove milis
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(OBDateUtils.convertDateToUTC(bbddBSLUpdated));
+            calendar.setLenient(true);
+            calendar.set(Calendar.MILLISECOND, 0);
+            if (date.getTime() != calendar.getTimeInMillis()) {
+              log.error("The record " + bankStatementLine.getString("referenceNo")
+                  + " is newer in the database. Avoid unmatching it");
+              throw new OBStaleObjectException("@APRM_StaleDate@");
+            }
+            final FIN_FinaccTransaction transaction = bsline.getFinancialAccountTransaction();
+            if (transaction != null) {
+              APRM_MatchingUtility.unmatch(bsline);
+            }
+          } catch (Exception e) {
+            errorLines.add(bankStatementLine.getString("referenceNo"));
+          }
+        }
+      }
+
+      /* Build Message */
+      int totalSuccess = bankStatementLineIdsLength - errorLines.size() - alreadyCleared;
+      String severity = "error";
+      String title = "";
+      String msg = "";
+      if (totalSuccess > 0) {
+        severity = "success";
+        title = OBMessageUtils.messageBD("Success");
+        msg = OBMessageUtils.getI18NMessage("APRM_UnmatchedRecords",
+            new String[] { String.valueOf(totalSuccess) });
+      }
+      if (!errorLines.isEmpty()) {
+        if (totalSuccess > 0) {
+          severity = "warning";
+          title = OBMessageUtils.messageBD("Warning");
+        } else {
+          severity = "error";
+          title = OBMessageUtils.messageBD("Error");
+        }
+
+        if (StringUtils.isNotBlank(msg)) {
+          msg += "<br/>";
+        }
+        msg += OBMessageUtils.getI18NMessage("APRM_ErrorOnUnmatchingRecords",
+            new String[] { String.valueOf(errorLines.size()) });
+        for (String string : errorLines) {
+          msg += string + ", ";
+        }
+        msg = msg.substring(0, msg.length() - 2);
+      }
+      errorMessage.put("severity", severity);
+      errorMessage.put("title", title);
+      errorMessage.put("text", msg);
+      result.put("message", errorMessage);
+
+    } catch (Exception e) {
+      OBDal.getInstance().rollbackAndClose();
+      log.error("Error Unmatching Transaction", e);
+      try {
+        Throwable ex = DbUtility.getUnderlyingSQLException(e);
+        String message = OBMessageUtils.translateError(ex.getMessage()).getMessage();
+        errorMessage = new JSONObject();
+        errorMessage.put("severity", "error");
+        errorMessage.put("title", OBMessageUtils.messageBD("Error"));
+        errorMessage.put("text", message);
+        result.put("message", errorMessage);
+      } catch (Exception e2) {
+        log.error("Message could not be built", e2);
+      }
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return result;
+  }
+}
\ No newline at end of file
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Mon Dec 21 16:26:08 2015 +0100
@@ -44,10 +44,13 @@
 import org.openbravo.advpaymentmngt.process.FIN_PaymentProcess;
 import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.filter.IsIDFilter;
+import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.security.OrganizationStructureProvider;
+import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
 import org.openbravo.data.FieldProvider;
@@ -66,8 +69,10 @@
 import org.openbravo.model.common.currency.ConversionRate;
 import org.openbravo.model.common.enterprise.DocumentType;
 import org.openbravo.model.common.invoice.Invoice;
+import org.openbravo.model.common.invoice.ReversedInvoice;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetailV;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
@@ -182,10 +187,10 @@
           OBContext.restorePreviousMode();
         }
 
+        Date voidDate = null;
+        Date voidAcctDate = null;
         Map<String, String> parameters = null;
         if (!strVoidInvoiceDate.isEmpty() && !strVoidInvoiceAcctDate.isEmpty()) {
-          Date voidDate = null;
-          Date voidAcctDate = null;
           try {
             voidDate = OBDateUtils.getDate(strVoidInvoiceDate);
             voidAcctDate = OBDateUtils.getDate(strVoidInvoiceAcctDate);
@@ -199,6 +204,107 @@
           parameters.put("voidedDocumentDate", OBDateUtils.formatDate(voidDate, "yyyy-MM-dd"));
           parameters.put("voidedDocumentAcctDate",
               OBDateUtils.formatDate(voidAcctDate, "yyyy-MM-dd"));
+
+        }
+
+        // In case of void a non paid invoice, create a dummy payment related to it with zero amount
+        FIN_Payment dummyPayment = null;
+        if ("RC".equals(strdocaction) && !invoice.isPaymentComplete()
+            && invoice.getTotalPaid().compareTo(BigDecimal.ZERO) == 0) {
+          try {
+            OBContext.setAdminMode(true);
+            final boolean isSOTrx = invoice.isSalesTransaction();
+            final DocumentType docType = FIN_Utility.getDocumentType(invoice.getOrganization(),
+                isSOTrx ? AcctServer.DOCTYPE_ARReceipt : AcctServer.DOCTYPE_APPayment);
+            final String strPaymentDocumentNo = FIN_Utility.getDocumentNo(docType,
+                docType.getTable() != null ? docType.getTable().getDBTableName() : "");
+            final OrganizationStructureProvider osp = OBContext.getOBContext()
+                .getOrganizationStructureProvider(invoice.getClient().getId());
+
+            // Get default Financial Account as it is done in Add Payment
+            FIN_FinancialAccount bpFinAccount = null;
+            if (isSOTrx
+                && invoice.getBusinessPartner().getAccount() != null
+                && FIN_Utility.getFinancialAccountPaymentMethod(invoice.getPaymentMethod().getId(),
+                    invoice.getBusinessPartner().getAccount().getId(), isSOTrx, invoice
+                        .getCurrency().getId()) != null
+                && osp.isInNaturalTree(invoice.getBusinessPartner().getAccount().getOrganization(),
+                    invoice.getOrganization())) {
+              bpFinAccount = invoice.getBusinessPartner().getAccount();
+            } else if (!isSOTrx
+                && invoice.getBusinessPartner().getPOFinancialAccount() != null
+                && FIN_Utility.getFinancialAccountPaymentMethod(invoice.getPaymentMethod().getId(),
+                    invoice.getBusinessPartner().getPOFinancialAccount().getId(), isSOTrx, invoice
+                        .getCurrency().getId()) != null
+                && osp.isInNaturalTree(invoice.getBusinessPartner().getPOFinancialAccount()
+                    .getOrganization(), invoice.getOrganization())) {
+              bpFinAccount = invoice.getBusinessPartner().getPOFinancialAccount();
+            } else {
+              FinAccPaymentMethod fpm = FIN_Utility.getFinancialAccountPaymentMethod(invoice
+                  .getPaymentMethod().getId(), null, isSOTrx, invoice.getCurrency().getId());
+              if (fpm != null
+                  && osp.isInNaturalTree(fpm.getAccount().getOrganization(),
+                      invoice.getOrganization())) {
+                bpFinAccount = fpm.getAccount();
+              }
+            }
+
+            // If no Financial Account exists, show an Error
+            if (bpFinAccount == null) {
+              msg = new OBError();
+              msg.setType("Error");
+              msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage()));
+              msg.setMessage(OBMessageUtils.messageBD("APRM_NoFinancialAccountAvailable"));
+              vars.setMessage(strTabId, msg);
+              printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true));
+              return;
+            }
+
+            // Calculate Conversion Rate
+            Date date = voidDate != null ? voidDate : invoice.getInvoiceDate();
+            BigDecimal rate = null;
+            if (!StringUtils.equals(invoice.getCurrency().getId(), bpFinAccount.getCurrency()
+                .getId())) {
+              final ConversionRate conversionRate = FinancialUtils.getConversionRate(date,
+                  invoice.getCurrency(), bpFinAccount.getCurrency(), invoice.getOrganization(),
+                  invoice.getClient());
+              if (conversionRate != null) {
+                rate = conversionRate.getMultipleRateBy();
+              }
+            }
+
+            // Create dummy payment
+            dummyPayment = dao
+                .getNewPayment(isSOTrx, invoice.getOrganization(), docType, strPaymentDocumentNo,
+                    invoice.getBusinessPartner(), invoice.getPaymentMethod(), bpFinAccount, "0",
+                    date, invoice.getDocumentNo(), invoice.getCurrency(), rate, null);
+            OBDal.getInstance().save(dummyPayment);
+
+            List<FIN_PaymentDetail> paymentDetails = new ArrayList<FIN_PaymentDetail>();
+            List<FIN_PaymentScheduleDetail> paymentScheduleDetails = dao
+                .getInvoicePendingScheduledPaymentDetails(invoice);
+            for (FIN_PaymentScheduleDetail psd : paymentScheduleDetails) {
+              FIN_PaymentDetail pd = OBProvider.getInstance().get(FIN_PaymentDetail.class);
+              pd.setFinPayment(dummyPayment);
+              pd.setAmount(psd.getAmount());
+              pd.setRefund(false);
+              OBDal.getInstance().save(pd);
+
+              paymentDetails.add(pd);
+              psd.setPaymentDetails(pd);
+              pd.getFINPaymentScheduleDetailList().add(psd);
+              OBDal.getInstance().save(psd);
+            }
+            dummyPayment.setFINPaymentDetailList(paymentDetails);
+            OBDal.getInstance().save(dummyPayment);
+
+          } catch (final Exception e) {
+            log4j.error("Exception while creating dummy payment for the invoice: "
+                + strC_Invoice_ID);
+            e.printStackTrace();
+          } finally {
+            OBContext.restorePreviousMode();
+          }
         }
 
         final ProcessInstance pinstance = CallProcess.getInstance().call(process, strC_Invoice_ID,
@@ -206,6 +312,56 @@
 
         OBDal.getInstance().getSession().refresh(invoice);
         invoice.setAPRMProcessinvoice(invoice.getDocumentAction());
+
+        if ("RC".equals(strdocaction) && pinstance.getResult() != 0L) {
+          try {
+            OBContext.setAdminMode(true);
+
+            // Get reversed payment
+            OBCriteria<ReversedInvoice> revInvoiceCriteria = OBDal.getInstance().createCriteria(
+                ReversedInvoice.class);
+            revInvoiceCriteria.add(Restrictions.eq(ReversedInvoice.PROPERTY_REVERSEDINVOICE,
+                invoice));
+            revInvoiceCriteria.setMaxResults(1);
+            ReversedInvoice revInvoice = (ReversedInvoice) revInvoiceCriteria.uniqueResult();
+
+            if (revInvoice != null && dummyPayment != null) {
+
+              List<FIN_PaymentDetail> paymentDetails = new ArrayList<FIN_PaymentDetail>();
+              List<FIN_PaymentScheduleDetail> paymentScheduleDetails = dao
+                  .getInvoicePendingScheduledPaymentDetails(revInvoice.getInvoice());
+              for (FIN_PaymentScheduleDetail psd : paymentScheduleDetails) {
+                FIN_PaymentDetail pd = OBProvider.getInstance().get(FIN_PaymentDetail.class);
+                pd.setFinPayment(dummyPayment);
+                pd.setAmount(psd.getAmount());
+                pd.setRefund(false);
+                OBDal.getInstance().save(pd);
+
+                paymentDetails.add(pd);
+                psd.setPaymentDetails(pd);
+                pd.getFINPaymentScheduleDetailList().add(psd);
+                OBDal.getInstance().save(psd);
+              }
+              dummyPayment.getFINPaymentDetailList().addAll(paymentDetails);
+              OBDal.getInstance().save(dummyPayment);
+
+              // Process dummy payment related with both actual invoice and reversed invoice
+              OBError message = FIN_AddPayment.processPayment(vars, this, "P", dummyPayment);
+              if ("Error".equals(message.getType())) {
+                message.setMessage(OBMessageUtils.messageBD("PaymentError") + " "
+                    + message.getMessage());
+                vars.setMessage(strTabId, message);
+              }
+            }
+          } catch (final Exception e) {
+            log4j.error("Exception while creating dummy payment for the invoice: "
+                + strC_Invoice_ID);
+            e.printStackTrace();
+          } finally {
+            OBContext.restorePreviousMode();
+          }
+        }
+
         // Remove invoice's used credit description
         if ("RE".equals(strdocaction) && pinstance.getResult() != 0L) {
           final String invDesc = invoice.getDescription();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Mon Dec 21 16:26:08 2015 +0100
@@ -242,8 +242,9 @@
           return;
         }
 
-        boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(reconciliation.TABLE_NAME,
-            reconciliation.getId(), reconciliation.TABLE_NAME + "_ID", "LE");
+        boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(
+            FIN_Reconciliation.TABLE_NAME, reconciliation.getId(), FIN_Reconciliation.TABLE_NAME
+                + "_ID", "LE");
         boolean documentEnabled = getDocumentConfirmation(this, reconciliation.getId());
         if (documentEnabled
             && !FIN_Utility.isPeriodOpen(reconciliation.getClient().getId(),
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Mon Dec 21 16:26:08 2015 +0100
@@ -1520,7 +1520,7 @@
     }
   }
 
-  private void addPaymentMethodList(OBCriteria obc, List<String> paymentMethods) {
+  private void addPaymentMethodList(OBCriteria<FIN_PaymentMethod> obc, List<String> paymentMethods) {
     List<String> paymentMethodsToRemove;
     Criterion compoundExp = null;
     while (paymentMethods.size() > 999) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Mon Dec 21 16:26:08 2015 +0100
@@ -109,11 +109,13 @@
       newTransaction.setStDimension(payment.getStDimension());
       newTransaction.setNdDimension(payment.getNdDimension());
       newTransaction.setCurrency(payment.getAccount().getCurrency());
-      newTransaction.setDescription(payment
-          .getDescription()
-          .replace("\n", ". ")
-          .substring(0,
-              payment.getDescription().length() > 254 ? 254 : payment.getDescription().length()));
+      String desc = "";
+      if(payment.getDescription()!=null && !payment.getDescription().isEmpty()){
+    	  desc = payment.getDescription()
+    	          .replace("\n", ". ")
+    	          .substring(0, payment.getDescription().length() > 254 ? 254 : payment.getDescription().length());
+      }
+      newTransaction.setDescription(desc);
       newTransaction.setClient(payment.getClient());
       newTransaction.setLineNo(getTransactionMaxLineNo(payment.getAccount()) + 10);
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -22,6 +22,7 @@
 import javax.enterprise.event.Observes;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.openbravo.advpaymentmngt.utility.APRMConstants;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
@@ -38,6 +39,7 @@
 
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(
       FIN_FinaccTransaction.ENTITY_NAME) };
+  protected Logger logger = Logger.getLogger(this.getClass());
 
   @Override
   protected Entity[] getObservedEntities() {
@@ -79,7 +81,8 @@
         .equals(transactionType, APRMConstants.TRXTYPE_BPWithdrawal))
         && glItem == null
         && payment == null) {
-      throw new OBException("@APRM_INVALID_TRANSACTION@");
+      logger.debug("@APRM_INVALID_TRANSACTION@");
+      throw new OBException("@APRM_INVALID_TRANSACTION@", false);
     }
   }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -32,13 +32,10 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.dal.service.OBQuery;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.currency.Currency;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
@@ -303,14 +300,14 @@
             strBPartnerId);
         if (isSOTrx
             && businessPartner.getAccount() != null
-            && getFinancialAccountPaymentMethod(paymentMethodId, businessPartner.getAccount()
-                .getId(), isSOTrx, currencyId) != null
+            && FIN_Utility.getFinancialAccountPaymentMethod(paymentMethodId, businessPartner
+                .getAccount().getId(), isSOTrx, currencyId) != null
             && osp.isInNaturalTree(businessPartner.getAccount().getOrganization(), OBDal
                 .getInstance().get(Organization.class, context.getString("inpadOrgId")))) {
           return businessPartner.getAccount().getId();
         } else if (!isSOTrx
             && businessPartner.getPOFinancialAccount() != null
-            && getFinancialAccountPaymentMethod(paymentMethodId, businessPartner
+            && FIN_Utility.getFinancialAccountPaymentMethod(paymentMethodId, businessPartner
                 .getPOFinancialAccount().getId(), isSOTrx, currencyId) != null
             && osp.isInNaturalTree(businessPartner.getPOFinancialAccount().getOrganization(), OBDal
                 .getInstance().get(Organization.class, context.getString("inpadOrgId")))) {
@@ -318,8 +315,8 @@
         }
       }
 
-      FinAccPaymentMethod fpm = getFinancialAccountPaymentMethod(paymentMethodId, null, isSOTrx,
-          currencyId);
+      FinAccPaymentMethod fpm = FIN_Utility.getFinancialAccountPaymentMethod(paymentMethodId, null,
+          isSOTrx, currencyId);
       if (fpm != null
           && osp.isInNaturalTree(fpm.getAccount().getOrganization(),
               OBDal.getInstance().get(Organization.class, context.getString("inpadOrgId")))) {
@@ -371,8 +368,8 @@
     boolean isSOTrx = "Y".equals(getDefaultIsSOTrx(requestMap));
     strFinancialAccountId = getContextFinancialAccount(requestMap);
     if (strFinPaymentMethodId != null
-        && getFinancialAccountPaymentMethod(strFinPaymentMethodId, strFinancialAccountId, isSOTrx,
-            null) != null) {
+        && FIN_Utility.getFinancialAccountPaymentMethod(strFinPaymentMethodId,
+            strFinancialAccountId, isSOTrx, null) != null) {
       return strFinPaymentMethodId;
     }
 
@@ -387,8 +384,8 @@
 
       if (isSOTrx
           && businessPartner.getPaymentMethod() != null
-          && getFinancialAccountPaymentMethod(businessPartner.getPaymentMethod().getId(),
-              strFinancialAccountId, isSOTrx, null) != null
+          && FIN_Utility.getFinancialAccountPaymentMethod(businessPartner.getPaymentMethod()
+              .getId(), strFinancialAccountId, isSOTrx, null) != null
           && osp.isInNaturalTree(businessPartner.getPaymentMethod().getOrganization(), OBDal
               .getInstance().get(Organization.class, context.getString("inpadOrgId")))) {
         return businessPartner.getPaymentMethod().getId();
@@ -396,8 +393,8 @@
 
       else if (!isSOTrx
           && businessPartner.getPOPaymentMethod() != null
-          && getFinancialAccountPaymentMethod(businessPartner.getPOPaymentMethod().getId(),
-              strFinancialAccountId, isSOTrx, null) != null
+          && FIN_Utility.getFinancialAccountPaymentMethod(businessPartner.getPOPaymentMethod()
+              .getId(), strFinancialAccountId, isSOTrx, null) != null
           && osp.isInNaturalTree(businessPartner.getPOPaymentMethod().getOrganization(), OBDal
               .getInstance().get(Organization.class, context.getString("inpadOrgId")))) {
         return businessPartner.getPOPaymentMethod().getId();
@@ -470,47 +467,4 @@
       return null;
     }
   }
-
-  private FinAccPaymentMethod getFinancialAccountPaymentMethod(String paymentMethodId,
-      String financialAccountId, boolean issotrx, String currencyId) {
-    StringBuffer where = new StringBuffer();
-    where.append(" as fapm");
-    where.append(" join fapm." + FinAccPaymentMethod.PROPERTY_ACCOUNT + " as fa");
-    where.append(" where fapm." + FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD + " = :paymentMethod");
-    where.append(" and fa." + FIN_FinancialAccount.PROPERTY_ACTIVE + " = true");
-    if (issotrx) {
-      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_PAYINALLOW + " = true");
-    } else {
-      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_PAYOUTALLOW + " = true");
-    }
-    if (!StringUtils.isEmpty(financialAccountId)) {
-      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_ACCOUNT + " = :financialAccount");
-    }
-    if (!StringUtils.isEmpty(currencyId)) {
-      where.append(" and (fa." + FIN_FinancialAccount.PROPERTY_CURRENCY + " = :currency");
-      if (issotrx) {
-        where.append(" or fapm." + FinAccPaymentMethod.PROPERTY_PAYINISMULTICURRENCY + " = true)");
-      } else {
-        where.append(" or fapm." + FinAccPaymentMethod.PROPERTY_PAYOUTISMULTICURRENCY + " = true)");
-      }
-    }
-    where.append(" order by fapm." + FinAccPaymentMethod.PROPERTY_DEFAULT + " desc");
-
-    OBQuery<FinAccPaymentMethod> qry = OBDal.getInstance().createQuery(FinAccPaymentMethod.class,
-        where.toString());
-    qry.setFilterOnReadableOrganization(false);
-    qry.setMaxResult(1);
-
-    qry.setNamedParameter("paymentMethod",
-        OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId));
-    if (!StringUtils.isEmpty(financialAccountId)) {
-      qry.setNamedParameter("financialAccount",
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId));
-    }
-    if (!StringUtils.isEmpty(currencyId)) {
-      qry.setNamedParameter("currency", OBDal.getInstance().get(Currency.class, currencyId));
-    }
-
-    return (FinAccPaymentMethod) qry.uniqueResult();
-  }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddTransactionFilterExpression.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddTransactionFilterExpression.java	Mon Dec 21 16:26:08 2015 +0100
@@ -22,6 +22,7 @@
 import java.math.BigDecimal;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -201,7 +202,17 @@
     String bankStatementLineId = context.getString("bankStatementLineId");
     FIN_BankStatementLine bankstatementline = OBDal.getInstance().get(FIN_BankStatementLine.class,
         bankStatementLineId);
-    return bankstatementline.getDescription();
+    String bpname = bankstatementline.getBpartnername();
+    String description = bankstatementline.getDescription();
+    if (StringUtils.isNotBlank(bpname)) {
+      if (StringUtils.isNotBlank(description)) {
+        return bpname + "\n" + description;
+      } else {
+        return bpname;
+      }
+    } else {
+      return description;
+    }
   }
 
   public String getDefaulDocumentCategory() {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Mon Dec 21 16:26:08 2015 +0100
@@ -217,7 +217,8 @@
           // Show error message when payment has no lines
           if (paymentDetails.size() == 0) {
             msg = OBMessageUtils.messageBD("APRM_PaymentNoLines");
-            throw new OBException(msg);
+            log4j.debug(msg);
+            throw new OBException(msg, false);
           }
           for (FIN_PaymentDetail paymentDetail : paymentDetails) {
             for (FIN_PaymentScheduleDetail paymentScheduleDetail : paymentDetail
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Mon Dec 21 16:26:08 2015 +0100
@@ -71,10 +71,11 @@
       OBDal.getInstance().flush();
       if (strAction.equals("P")) {
         for (FIN_ReconciliationLine_v recLine : reconciliation.getFINReconciliationLineVList()) {
-          boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(recLine
-              .getFinancialAccountTransaction().getReconciliation().TABLE_NAME, recLine
-              .getFinancialAccountTransaction().getReconciliation().getId(), recLine
-              .getFinancialAccountTransaction().getReconciliation().TABLE_NAME + "_ID", "LE");
+          recLine.getFinancialAccountTransaction().getReconciliation();
+          recLine.getFinancialAccountTransaction().getReconciliation();
+          boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(
+              FIN_Reconciliation.TABLE_NAME, recLine.getFinancialAccountTransaction()
+                  .getReconciliation().getId(), FIN_Reconciliation.TABLE_NAME + "_ID", "LE");
           if (!FIN_Utility.isPeriodOpen(recLine.getFinancialAccountTransaction().getClient()
               .getId(), AcctServer.DOCTYPE_Reconciliation, recLine.getFinancialAccountTransaction()
               .getOrganization().getId(),
@@ -131,10 +132,11 @@
           return;
         }
         for (FIN_ReconciliationLine_v recLine : reconciliation.getFINReconciliationLineVList()) {
-          boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(recLine
-              .getFinancialAccountTransaction().getReconciliation().TABLE_NAME, recLine
-              .getFinancialAccountTransaction().getReconciliation().getId(), recLine
-              .getFinancialAccountTransaction().getReconciliation().TABLE_NAME + "_ID", "LE");
+          recLine.getFinancialAccountTransaction().getReconciliation();
+          recLine.getFinancialAccountTransaction().getReconciliation();
+          boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(
+              FIN_Reconciliation.TABLE_NAME, recLine.getFinancialAccountTransaction()
+                  .getReconciliation().getId(), FIN_Reconciliation.TABLE_NAME + "_ID", "LE");
           if (!FIN_Utility.isPeriodOpen(recLine.getFinancialAccountTransaction().getClient()
               .getId(), AcctServer.DOCTYPE_Reconciliation, recLine.getFinancialAccountTransaction()
               .getOrganization().getId(),
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Mon Dec 21 16:26:08 2015 +0100
@@ -20,7 +20,6 @@
 package org.openbravo.advpaymentmngt.utility;
 
 import java.math.BigDecimal;
-import java.sql.BatchUpdateException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
@@ -80,6 +79,7 @@
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
 import org.openbravo.service.db.CallStoredProcedure;
+import org.openbravo.service.db.DbUtility;
 import org.openbravo.utils.Replace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -260,12 +260,8 @@
    * @return the underlying trigger message.
    */
   public static String getExceptionMessage(Throwable t) {
-    if (t.getCause() instanceof BatchUpdateException
-        && ((BatchUpdateException) t.getCause()).getNextException() != null) {
-      final BatchUpdateException bue = (BatchUpdateException) t.getCause();
-      return bue.getNextException().getMessage();
-    }
-    return t.getMessage();
+    Throwable throwable = DbUtility.getUnderlyingSQLException(t);
+    return throwable.getMessage();
   }
 
   /**
@@ -1531,4 +1527,60 @@
   private static void decreaseCustomerCredit(BusinessPartner businessPartner, BigDecimal amount) {
     updateCustomerCredit(businessPartner, amount, false);
   }
+
+  /**
+   * Get an active FinAccPaymentMethod related to paymentMethodId FIN_PaymentMethod and
+   * financialAccountId FIN_FinancialAccount, if exists. If paymentMethodId is null it will retrieve
+   * any FinAccPaymentMethod related to paymentMethodId FIN_PaymentMethod ordered by default field.
+   * FinAccPaymentMethod must have pay in/out active and must be compatible with currencyId Currency
+   * if currencyId is not null.
+   * 
+   * @param paymentMethodId
+   * @param financialAccountId
+   * @param issotrx
+   * @param currencyId
+   * @return
+   */
+  public static FinAccPaymentMethod getFinancialAccountPaymentMethod(String paymentMethodId,
+      String financialAccountId, boolean issotrx, String currencyId) {
+    StringBuffer where = new StringBuffer();
+    where.append(" as fapm");
+    where.append(" join fapm." + FinAccPaymentMethod.PROPERTY_ACCOUNT + " as fa");
+    where.append(" where fapm." + FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD + " = :paymentMethod");
+    where.append(" and fa." + FIN_FinancialAccount.PROPERTY_ACTIVE + " = true");
+    if (issotrx) {
+      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_PAYINALLOW + " = true");
+    } else {
+      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_PAYOUTALLOW + " = true");
+    }
+    if (!StringUtils.isEmpty(financialAccountId)) {
+      where.append(" and fapm." + FinAccPaymentMethod.PROPERTY_ACCOUNT + " = :financialAccount");
+    }
+    if (!StringUtils.isEmpty(currencyId)) {
+      where.append(" and (fa." + FIN_FinancialAccount.PROPERTY_CURRENCY + " = :currency");
+      if (issotrx) {
+        where.append(" or fapm." + FinAccPaymentMethod.PROPERTY_PAYINISMULTICURRENCY + " = true)");
+      } else {
+        where.append(" or fapm." + FinAccPaymentMethod.PROPERTY_PAYOUTISMULTICURRENCY + " = true)");
+      }
+    }
+    where.append(" order by fapm." + FinAccPaymentMethod.PROPERTY_DEFAULT + " desc");
+
+    OBQuery<FinAccPaymentMethod> qry = OBDal.getInstance().createQuery(FinAccPaymentMethod.class,
+        where.toString());
+    qry.setFilterOnReadableOrganization(false);
+    qry.setMaxResult(1);
+
+    qry.setNamedParameter("paymentMethod",
+        OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId));
+    if (!StringUtils.isEmpty(financialAccountId)) {
+      qry.setNamedParameter("financialAccount",
+          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId));
+    }
+    if (!StringUtils.isEmpty(currencyId)) {
+      qry.setNamedParameter("currency", OBDal.getInstance().get(Currency.class, currencyId));
+    }
+
+    return (FinAccPaymentMethod) qry.uniqueResult();
+  }
 }
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js	Mon Dec 21 16:26:08 2015 +0100
@@ -36,7 +36,7 @@
     if (trxSelection && trxSelection[0]) {
       var trxDepositAmt = trxSelection[0].depositAmount,
           trxPaymentAmt = trxSelection[0].paymentAmount,
-          blineAmt = view.callerField.view.getContextInfo().match_statement._selection[0].amount,
+          blineAmt = view.callerField.record.amount,
           trxAmt = trxDepositAmt - trxPaymentAmt,
           hideSplitConfirmation = OB.PropertyStore.get('APRM_MATCHSTATEMENT_HIDE_PARTIALMATCH_POPUP', view.windowId);
 
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js	Mon Dec 21 16:26:08 2015 +0100
@@ -26,10 +26,37 @@
 };
 
 OB.APRM.MatchStatement.onLoad = function (view) {
-  var execute, grid = view.theForm.getItem('match_statement').canvas.viewGrid;
+  var execute, grid = view.theForm.getItem('match_statement').canvas.viewGrid,
+      buttons = view.popupButtons.members[0].members,
+      i, button, propertyButtonValue = '_buttonValue';
   view.cancelButton.hide();
   view.parentElement.parentElement.closeButton.hide();
 
+  for (i = 0; i < buttons.length; i++) {
+    button = buttons[i];
+    if (button[propertyButtonValue] === 'UN') {
+      view.unmatchButton = button;
+      button.hide();
+      break;
+    }
+  }
+
+  button.action = function () {
+    var callback = function (response, data, request) {
+        view.onRefreshFunction(view);
+        if (data && data.message && data.message.severity === 'error') {
+          view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, data.message.title, data.message.text);
+        } else if (data && data.message && data.message.severity === 'success') {
+          view.messageBar.setMessage(isc.OBMessageBar.TYPE_SUCCESS, data.message.title, data.message.text);
+        } else if (data && data.message && data.message.severity === 'warning') {
+          view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, data.message.title, data.message.text);
+        }
+        };
+    OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.UnMatchSelectedTransactionsActionHandler', {
+      bankStatementLineIds: grid.getSelectedRecords()
+    }, {}, callback);
+  };
+
   grid.dataSourceOrig = grid.dataSource;
   grid.dataSource = null;
   execute = function (ok) {
@@ -73,6 +100,24 @@
   actionHandlerCall();
 };
 
+OB.APRM.MatchStatement.selectionChanged = function (grid, changedRecord, recordList) {
+  if (changedRecord.obSelected && changedRecord.cleared) {
+    grid.view.unmatchButton.show();
+    return;
+  } else {
+    var i, record, selection = grid.getSelectedRecords() || [],
+        len = selection.length;
+    for (i = 0; i < len; i++) {
+      record = grid.getEditedRecord(grid.getRecordIndex(selection[i]));
+      if (record && record.obSelected && record.cleared) {
+        grid.view.unmatchButton.show();
+        return;
+      }
+    }
+  }
+
+  grid.view.unmatchButton.hide();
+};
 
 isc.ClassFactory.defineClass('APRMMatchStatGridButtonsComponent', isc.HLayout);
 
@@ -128,7 +173,9 @@
       }
     });
     // Disable searchButton button if record is linked to a transaction
+    // and update Unmatch All button
     searchButton.setDisabled(me.record.cleared);
+    OB.APRM.MatchStatement.selectionChanged(me.grid, me.record);
 
     addButton = isc.OBGridToolStripIcon.create({
       buttonType: 'add',
@@ -168,7 +215,9 @@
       }
     });
     // Disable addButton button if record is linked to a transaction
+    // and update Unmatch All button
     addButton.setDisabled(me.record.cleared);
+    OB.APRM.MatchStatement.selectionChanged(me.grid, me.record);
 
     clearButton = isc.OBGridToolStripIcon.create({
       buttonType: 'clearRight',
@@ -197,7 +246,9 @@
     buttonSeparator2 = isc.OBGridToolStripSeparator.create({});
 
     // Disable clear button if record is not linked to a transaction
+    // and update Unmatch All button
     clearButton.setDisabled(!me.record.cleared);
+    OB.APRM.MatchStatement.selectionChanged(me.grid, me.record);
 
     this.addMembers([searchButton, buttonSeparator1, addButton, buttonSeparator2, clearButton]);
     this.Super('initWidget', arguments);
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.28148]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.27639]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.28148]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7162,8 +7162,8 @@
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <NAME><![CDATA[IsLazyFiltering]]></NAME>
-<!--93DDA487C86244A28FB80B6F09E74385-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter action until a button be pressed.]]></DESCRIPTION>
-<!--93DDA487C86244A28FB80B6F09E74385-->  <HELP><![CDATA[If it is set, the grid won't perform a filter action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--93DDA487C86244A28FB80B6F09E74385-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
+<!--93DDA487C86244A28FB80B6F09E74385-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_TABLE_ID><![CDATA[5D50320222DD4865ADFD50364C84291D]]></AD_TABLE_ID>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -10394,8 +10394,8 @@
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <NAME><![CDATA[IsLazyFiltering]]></NAME>
-<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter action until a button be pressed.]]></DESCRIPTION>
-<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <HELP><![CDATA[If it is set, the grid won't perform a filter action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
+<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_TABLE_ID><![CDATA[8A16662B37184121A1EDAA89890E160C]]></AD_TABLE_ID>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -88,8 +88,8 @@
 <!--10922048465547F48765035389E22977-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--10922048465547F48765035389E22977-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
 <!--10922048465547F48765035389E22977-->  <PRINTNAME><![CDATA[Lazy Filtering on Grid]]></PRINTNAME>
-<!--10922048465547F48765035389E22977-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter action until a button be pressed.]]></DESCRIPTION>
-<!--10922048465547F48765035389E22977-->  <HELP><![CDATA[If it is set, the grid won't perform a filter action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--10922048465547F48765035389E22977-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
+<!--10922048465547F48765035389E22977-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
 <!--10922048465547F48765035389E22977-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--10922048465547F48765035389E22977-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--10922048465547F48765035389E22977--></AD_ELEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -4536,8 +4536,8 @@
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
-<!--B222E0B3174A43D0935CCDD7520C37EF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter action until a button be pressed.]]></DESCRIPTION>
-<!--B222E0B3174A43D0935CCDD7520C37EF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--B222E0B3174A43D0935CCDD7520C37EF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
+<!--B222E0B3174A43D0935CCDD7520C37EF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_TAB_ID><![CDATA[13FE911F7F684A47801DF55525BAD4A1]]></AD_TAB_ID>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_COLUMN_ID><![CDATA[93DDA487C86244A28FB80B6F09E74385]]></AD_COLUMN_ID>
@@ -4564,8 +4564,8 @@
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
-<!--B46E1D7D67054980830418FDA0F571BF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter action until a button be pressed.]]></DESCRIPTION>
-<!--B46E1D7D67054980830418FDA0F571BF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--B46E1D7D67054980830418FDA0F571BF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
+<!--B46E1D7D67054980830418FDA0F571BF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_TAB_ID><![CDATA[49B33DC2EDFD45A48EECE139AD5E9AC9]]></AD_TAB_ID>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_COLUMN_ID><![CDATA[FEEFB3DC943940A08FE7DCF663BFF90F]]></AD_COLUMN_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.28148]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -56,4 +56,17 @@
 <!--C17951F970E942FD9F3771B7BE91D049-->  <IDFKFILTERING><![CDATA[Y]]></IDFKFILTERING>
 <!--C17951F970E942FD9F3771B7BE91D049--></OBSERDS_DATASOURCE>
 
+<!--DB9F062472294F12A0291A7BD203F922--><OBSERDS_DATASOURCE>
+<!--DB9F062472294F12A0291A7BD203F922-->  <OBSERDS_DATASOURCE_ID><![CDATA[DB9F062472294F12A0291A7BD203F922]]></OBSERDS_DATASOURCE_ID>
+<!--DB9F062472294F12A0291A7BD203F922-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DB9F062472294F12A0291A7BD203F922-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DB9F062472294F12A0291A7BD203F922-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--DB9F062472294F12A0291A7BD203F922-->  <NAME><![CDATA[AD Alert Datasource]]></NAME>
+<!--DB9F062472294F12A0291A7BD203F922-->  <CLASSNAME><![CDATA[org.openbravo.client.application.ADAlertDatasourceService]]></CLASSNAME>
+<!--DB9F062472294F12A0291A7BD203F922-->  <OBCLKER_TEMPLATE_ID><![CDATA[2BAD445C2A0343C58E455F9BD379C690]]></OBCLKER_TEMPLATE_ID>
+<!--DB9F062472294F12A0291A7BD203F922-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DB9F062472294F12A0291A7BD203F922-->  <USEASTABLEDATAORIGIN><![CDATA[N]]></USEASTABLEDATAORIGIN>
+<!--DB9F062472294F12A0291A7BD203F922-->  <IDFKFILTERING><![CDATA[Y]]></IDFKFILTERING>
+<!--DB9F062472294F12A0291A7BD203F922--></OBSERDS_DATASOURCE>
+
 </data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java	Mon Dec 21 16:26:08 2015 +0100
@@ -0,0 +1,210 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (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) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.client.application;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.SQLQuery;
+import org.hibernate.exception.SQLGrammarException;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.core.DalUtil;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.utility.UsedByLink;
+import org.openbravo.model.ad.alert.Alert;
+import org.openbravo.model.ad.alert.AlertRecipient;
+import org.openbravo.model.ad.alert.AlertRule;
+import org.openbravo.service.datasource.DefaultDataSourceService;
+import org.openbravo.service.json.JsonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Datasource used by the Alert Management window
+ */
+public class ADAlertDatasourceService extends DefaultDataSourceService {
+  private static final String AD_TABLE_ID = "594";
+  private static final String ALERT_STATUS = "_alertStatus";
+  private static final String ALERT_RULE_TAB = "alertRule.tab.id";
+  private static final Logger log = LoggerFactory.getLogger(ADAlertDatasourceService.class);
+
+  @Override
+  public Entity getEntity() {
+    return ModelProvider.getInstance().getEntityByTableId(AD_TABLE_ID);
+  }
+
+  @Override
+  public String fetch(Map<String, String> parameters) {
+    long t = System.currentTimeMillis();
+    String alertStatus = "";
+    try {
+      // Retrieve the information from the request parameters
+      if (parameters.get(JsonConstants.WHERE_PARAMETER) != null) {
+        log.warn("_where parameter is not allowed, ignoring it");
+      }
+      alertStatus = parameters.get(ALERT_STATUS);
+      alertStatus = StringUtils.isEmpty(alertStatus) ? "" : alertStatus.toUpperCase();
+
+      List<String> alertList = getAlertIds();
+
+      String whereClause = buildWhereClause(alertStatus, alertList);
+      parameters.put(JsonConstants.WHERE_PARAMETER, whereClause);
+
+      if (parameters.get(JsonConstants.DISTINCT_PARAMETER) == null) {
+        // Also return the tab id of the alert rule, just when loading the grid from the server.
+        // This is used in the Alert Management window to navigate to the record related to an alert
+        parameters.put(JsonConstants.ADDITIONAL_PROPERTIES_PARAMETER, ALERT_RULE_TAB);
+      }
+
+      return super.fetch(parameters, true);
+    } catch (Exception ex) {
+      log.error("Error while fetching alert data", ex);
+      throw new OBException(ex);
+    } finally {
+      log.debug("Alert list with status {} retrieved in {} ms", alertStatus,
+          System.currentTimeMillis() - t);
+    }
+  }
+
+  private List<String> getAlertIds() {
+    // Get alert rules visible for context's the role/user.
+    try {
+      OBContext.setAdminMode(false);
+      StringBuffer whereClause = new StringBuffer();
+      whereClause.append(" as ar ");
+      whereClause.append("\nwhere exists (select 1 from ar."
+          + AlertRule.PROPERTY_ADALERTRECIPIENTLIST + " as arr");
+      whereClause.append("\n    where arr." + AlertRecipient.PROPERTY_USERCONTACT + ".id = :user");
+      whereClause.append("\n      or (");
+      whereClause.append("arr." + AlertRecipient.PROPERTY_USERCONTACT + " is null");
+      whereClause.append("\n          and arr." + AlertRecipient.PROPERTY_ROLE + ".id = :role))");
+
+      OBQuery<AlertRule> alertRulesQuery = OBDal.getInstance().createQuery(AlertRule.class,
+          whereClause.toString());
+      alertRulesQuery.setNamedParameter("user", DalUtil.getId(OBContext.getOBContext().getUser()));
+      alertRulesQuery.setNamedParameter("role", DalUtil.getId(OBContext.getOBContext().getRole()));
+
+      return getAlertIdsFromAlertRules(alertRulesQuery.list());
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private List<String> getAlertIdsFromAlertRules(List<AlertRule> alertRules) {
+    List<String> alertIds = new ArrayList<String>();
+    for (AlertRule alertRule : alertRules) {
+      // Adding alert rule if it has not filter clause. In case it has, it will be added only in
+      // case it returns data after applying the filter clause.
+      if (alertRule.getFilterClause() == null) {
+        for (Alert alert : alertRule.getADAlertList()) {
+          alertIds.add((String) DalUtil.getId(alert));
+        }
+      }
+
+      String filterClause = null;
+      if (alertRule.getFilterClause() != null) {
+        try {
+          filterClause = new UsedByLink().getWhereClause(RequestContext.get()
+              .getVariablesSecureApp(), "", alertRule.getFilterClause());
+        } catch (ServletException e) {
+          throw new IllegalStateException(e);
+        }
+        final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + " AND AD_CLIENT_ID "
+            + OBDal.getInstance().getReadableClientsInClause() + " AND AD_ORG_ID "
+            + OBDal.getInstance().getReadableOrganizationsInClause() + " AND AD_ALERTRULE_ID = ? "
+            + (filterClause == null ? "" : filterClause);
+        final SQLQuery sqlQuery = OBDal.getInstance().getSession().createSQLQuery(sql)
+            .addEntity(Alert.ENTITY_NAME);
+        sqlQuery.setParameter(0, alertRule.getId());
+
+        try {
+          @SuppressWarnings("unchecked")
+          List<Alert> alertsWithFilterClause = sqlQuery.list();
+          log.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() + ") - SQL:'" + sql
+              + "' - Rows: " + alertsWithFilterClause.size());
+          for (Alert alert : alertsWithFilterClause) {
+            alertIds.add((String) DalUtil.getId(alert));
+          }
+        } catch (SQLGrammarException e) {
+          log.error("An error has ocurred when trying to process the alerts: " + e.getMessage(), e);
+        }
+      }
+    }
+    return alertIds;
+  }
+
+  private String buildWhereClause(String alertStatus, List<String> alertList) {
+    int chunkSize = 1000;
+    String filterClause;
+    String whereClause = "coalesce(to_char(status), 'NEW') = '"
+        + StringEscapeUtils.escapeSql(alertStatus) + "'";
+    ArrayList<String> alertListToRemove;
+
+    if (alertList.size() == 0) {
+      return "1 = 2";
+    }
+
+    if (alertList.size() <= chunkSize) {
+      whereClause += " and e.id in (" + toStringList(alertList) + ")";
+      return whereClause;
+    }
+
+    // There are more than 1000 alerts to include in the where clause, Oracle doesn't
+    // support it, so let's split them in chunks with <=1000 elements each
+    alertListToRemove = new ArrayList<String>();
+    filterClause = "";
+    while (alertList.size() > chunkSize) {
+      alertListToRemove = new ArrayList<String>(alertList.subList(0, chunkSize - 1));
+      if (StringUtils.isEmpty(filterClause)) {
+        filterClause = " and (e.id in (" + toStringList(alertListToRemove) + ")";
+      } else {
+        filterClause += " or e.id in (" + toStringList(alertListToRemove) + ")";
+      }
+      alertList.removeAll(alertListToRemove);
+    }
+    if (!alertList.isEmpty()) {
+      filterClause += " or e.id in (" + toStringList(alertList) + "))";
+    } else {
+      filterClause += ")";
+    }
+    whereClause += filterClause;
+    return whereClause;
+  }
+
+  private String toStringList(List<String> list) {
+    String result = "";
+    for (String s : list) {
+      if (!StringUtils.isEmpty(result)) {
+        result += ", ";
+      }
+      result += "'" + s + "'";
+    }
+    return result;
+  }
+}
\ No newline at end of file
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,25 +22,17 @@
 import java.util.Map;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.servlet.ServletException;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.SQLQuery;
-import org.hibernate.exception.SQLGrammarException;
 import org.openbravo.client.kernel.BaseActionHandler;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
-import org.openbravo.dal.service.OBQuery;
-import org.openbravo.erpCommon.utility.UsedByLink;
 import org.openbravo.model.ad.alert.Alert;
-import org.openbravo.model.ad.alert.AlertRecipient;
-import org.openbravo.model.ad.alert.AlertRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author gorkaion
@@ -48,10 +40,8 @@
  */
 @ApplicationScoped
 public class AlertManagementActionHandler extends BaseActionHandler {
-  private static final Logger log = Logger.getLogger(AlertManagementActionHandler.class);
-  private static final String GET_ALERT_RULES = "getAlertRules";
+  private static final Logger log = LoggerFactory.getLogger(AlertManagementActionHandler.class);
   private static final String MOVE_TO_STATUS = "moveToStatus";
-  private static final Logger log4j = Logger.getLogger(AlertManagementActionHandler.class);
 
   /*
    * (non-Javadoc)
@@ -66,9 +56,7 @@
     try {
       JSONObject o = new JSONObject(content);
       final String strEventType = o.getString("eventType");
-      if (GET_ALERT_RULES.equals(strEventType)) {
-        object.put("alertRules", getAlertRules());
-      } else if (MOVE_TO_STATUS.equals(strEventType)) {
+      if (MOVE_TO_STATUS.equals(strEventType)) {
         final String alertIDs = o.getString("alertIDs");
         final String oldStatus = o.getString("oldStatus");
         final String newStatus = o.getString("newStatus");
@@ -88,103 +76,6 @@
     return object;
   }
 
-  private JSONArray getAlertRules() {
-    // Get alert rules visible for context's the role/user.
-    StringBuffer whereClause = new StringBuffer();
-    whereClause.append(" as ar ");
-    whereClause.append("\nwhere exists (select 1 from ar."
-        + AlertRule.PROPERTY_ADALERTRECIPIENTLIST + " as arr");
-    whereClause.append("\n    where arr." + AlertRecipient.PROPERTY_USERCONTACT + ".id = :user");
-    whereClause.append("\n      or (");
-    whereClause.append("arr." + AlertRecipient.PROPERTY_USERCONTACT + " is null");
-    whereClause.append("\n          and arr." + AlertRecipient.PROPERTY_ROLE + ".id = :role))");
-
-    OBQuery<AlertRule> alertRulesQuery = OBDal.getInstance().createQuery(AlertRule.class,
-        whereClause.toString());
-    alertRulesQuery.setNamedParameter("user", OBContext.getOBContext().getUser().getId());
-    alertRulesQuery.setNamedParameter("role", OBContext.getOBContext().getRole().getId());
-
-    JSONArray alertRules = new JSONArray();
-    try {
-      if (alertRulesQuery.count() > 0) {
-        for (AlertRule alertRule : alertRulesQuery.list()) {
-          JSONObject alertRuleJson = null;
-
-          // Adding alert rule if it has not filter clause. In case it has, it will be added only in
-          // case it returns data after applying the filter clause.
-          if (alertRule.getFilterClause() == null) {
-            alertRuleJson = new JSONObject();
-            alertRuleJson.put("name", alertRule.getIdentifier());
-            alertRuleJson.put("alertRuleId", alertRule.getId());
-            if (alertRule.getTab() != null) {
-              alertRuleJson.put("tabId", alertRule.getTab().getId());
-            } else {
-              alertRuleJson.put("tabId", "");
-            }
-          }
-
-          String filterClause = null;
-          if (alertRule.getFilterClause() != null) {
-            try {
-              filterClause = new UsedByLink().getWhereClause(RequestContext.get()
-                  .getVariablesSecureApp(), "", alertRule.getFilterClause());
-            } catch (ServletException e) {
-              throw new IllegalStateException(e);
-            }
-            final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + " AND AD_CLIENT_ID "
-                + OBDal.getInstance().getReadableClientsInClause() + " AND AD_ORG_ID "
-                + OBDal.getInstance().getReadableOrganizationsInClause()
-                + " AND AD_ALERTRULE_ID = ? " + (filterClause == null ? "" : filterClause);
-            final SQLQuery sqlQuery = OBDal.getInstance().getSession().createSQLQuery(sql)
-                .addEntity(Alert.ENTITY_NAME);
-            sqlQuery.setParameter(0, alertRule.getId());
-
-            try {
-              log4j.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() + ") - SQL:'"
-                  + sql + "' - Rows: " + sqlQuery.list().size());
-              // It is not possible to add an SQL filter clause to the grid's default datasource.
-              // A String with the alert_id's to filter the grid's so only alerts with access are
-              // shown.
-              if (sqlQuery.list().size() > 0) {
-                // Alert rule returns data, adding it to list of alert rules.
-                alertRuleJson = new JSONObject();
-                alertRuleJson.put("name", alertRule.getIdentifier());
-                alertRuleJson.put("alertRuleId", alertRule.getId());
-                if (alertRule.getTab() != null) {
-                  alertRuleJson.put("tabId", alertRule.getTab().getId());
-                } else {
-                  alertRuleJson.put("tabId", "");
-                }
-
-                String filterAlerts = "";
-                @SuppressWarnings("unchecked")
-                List<Alert> alerts = sqlQuery.list();
-                for (Alert alert : alerts) {
-                  if (!filterAlerts.isEmpty()) {
-                    filterAlerts += ", ";
-                  }
-                  filterAlerts += "'" + alert.getId() + "'";
-                }
-                alertRuleJson.put("alerts", filterAlerts);
-
-              }
-            } catch (SQLGrammarException e) {
-              log4j.error(
-                  "An error has ocurred when trying to process the alerts: " + e.getMessage(), e);
-            }
-          }
-          if (alertRuleJson != null) {
-            alertRules.put(alertRuleJson);
-          }
-        }
-      }
-    } catch (JSONException e) {
-      log.error("Error executing action: " + e.getMessage(), e);
-    }
-
-    return alertRules;
-  }
-
   private void setNewStatus(String alertIDs, String newStatus) {
     if (StringUtils.isEmpty(alertIDs)) {
       return;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -37,6 +37,7 @@
 import org.openbravo.base.model.domaintype.LongDomainType;
 import org.openbravo.base.model.domaintype.StringDomainType;
 import org.openbravo.base.util.Check;
+import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 
 /**
@@ -82,9 +83,9 @@
     }
   }
 
-  private static DomainType getParameterDomainType(Parameter parameter) {
-    return ModelProvider.getInstance().getReference(parameter.getReference().getId())
-        .getDomainType();
+  public static DomainType getParameterDomainType(Parameter parameter) {
+    String referenceId = (String) DalUtil.getId(parameter.getReference());
+    return ModelProvider.getInstance().getReference(referenceId).getDomainType();
   }
 
   /**
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -44,6 +44,8 @@
 import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.Window;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Reads the view and generates it.
@@ -52,6 +54,8 @@
  */
 @RequestScoped
 public class ViewComponent extends BaseComponent {
+  private static Logger log = LoggerFactory.getLogger(ViewComponent.class);
+
   @Inject
   private StandardWindowComponent standardWindowComponent;
 
@@ -63,7 +67,7 @@
 
   @Override
   public String generate() {
-
+    long t = System.currentTimeMillis();
     final String viewId = getParameter("viewId");
     if (viewId == null) {
       throw new IllegalArgumentException("viewId parameter not found, it is mandatory");
@@ -93,6 +97,7 @@
       }
     } finally {
       OBContext.restorePreviousMode();
+      log.debug("View {} generated in {} ms", viewId, System.currentTimeMillis() - t);
     }
   }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2011-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  Mallikarjun M
  ************************************************************************
@@ -104,8 +104,7 @@
         objCloneOrdLine.setReservedQuantity(new BigDecimal("0"));
         objCloneOrdLine.setDeliveredQuantity(new BigDecimal("0"));
         objCloneOrdLine.setInvoicedQuantity(new BigDecimal("0"));
-        if (!"".equals(bdPriceList) || bdPriceList != null
-            || !bdPriceList.equals(BigDecimal.ZERO.setScale(bdPriceList.scale()))) {
+        if (bdPriceList != null && bdPriceList.compareTo(BigDecimal.ZERO) != 0) {
           objCloneOrdLine.setListPrice(bdPriceList);
         }
         objCloneOrdLine.setCreationDate(new Date());
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -295,7 +295,8 @@
           || limitation == LicenseRestriction.MODULE_EXPIRED
           || limitation == LicenseRestriction.NOT_MATCHED_INSTANCE
           || limitation == LicenseRestriction.HB_NOT_ACTIVE
-          || limitation == LicenseRestriction.ON_DEMAND_OFF_PLATFORM) {
+          || limitation == LicenseRestriction.ON_DEMAND_OFF_PLATFORM
+          || limitation == LicenseRestriction.POS_TERMINALS_EXCEEDED) {
         return Collections.singletonList(OBDal.getInstance().get(Role.class, "0"));
       }
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Mon Dec 21 16:26:08 2015 +0100
@@ -556,7 +556,6 @@
       SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
       reportExportConfiguration.setOnePagePerSheet(false);
       reportExportConfiguration.setRemoveEmptySpaceBetweenRows(true);
-      reportExportConfiguration.setDetectCellType(true);
       excelExporter.setConfiguration(reportExportConfiguration);
     }
     excelExporter.setExporterInput(exporterInput);
@@ -591,7 +590,6 @@
       SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
       reportExportConfiguration.setOnePagePerSheet(false);
       reportExportConfiguration.setRemoveEmptySpaceBetweenRows(true);
-      reportExportConfiguration.setDetectCellType(true);
       excelExporter.setConfiguration(reportExportConfiguration);
     }
     excelExporter.setExporterInput(exporterInput);
@@ -1127,7 +1125,7 @@
   }
 
   /**
-   * @see ReportingUtils#concatPDFReport(List<JasperPrint>, boolean, OutputStream,
+   * @see ReportingUtils#concatPDFReport(List, boolean, OutputStream,
    *      SimplePdfExporterConfiguration)
    */
   public static void concatPDFReport(List<JasperPrint> jasperPrintList, boolean createBookmarks,
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl	Mon Dec 21 16:26:08 2015 +0100
@@ -57,7 +57,7 @@
       },
     </#if>
     <#if param.length != -1>
-      length: ${param.length},
+      length: ${param.length?c},
     </#if>
     required: ${param.required?string}
     ${param.parameterProperties}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl	Mon Dec 21 16:26:08 2015 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -95,12 +95,20 @@
     gridProperties: ${tabComponent.viewGrid},
 
     handleReadOnlyLogic: function(currentValues, context, form){
-     <#list tabComponent.fieldHandler.fields as field>
-      <#if field.readOnlyIf != "">
-      if (form.getField('${field.name}') && form.getField('${field.name}').setDisabled) {
-        form.getField('${field.name}').setDisabled(${field.readOnlyIf});
-      }
-      </#if>
+    <#list tabComponent.fieldHandler.fields as field>
+    <#if field.readOnlyIf != "" && field.showIf == "">
+    if (form.getField('${field.name}') && form.getField('${field.name}').setDisabled) {
+       form.getField('${field.name}').setDisabled(${field.readOnlyIf});
+    }
+    <#elseif field.readOnlyIf == "" && field.showIf != "">
+    if (form.getField('${field.name}') && form.getField('${field.name}').setDisabled) {
+       form.getField('${field.name}').setDisabled((${field.showIf}) === false);
+    }
+    <#elseif field.readOnlyIf != "" && field.showIf != "">
+    if (form.getField('${field.name}') && form.getField('${field.name}').setDisabled) {
+       form.getField('${field.name}').setDisabled((${field.readOnlyIf}) || (${field.showIf}) === false);
+    }
+    </#if>
     </#list>
     },
     
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl	Mon Dec 21 16:26:08 2015 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -23,14 +23,14 @@
     <#--
     // this this is the view    
     -->
-    statusBarFields: this.statusBarFields<#if data.fieldHandler.hasFieldsWithReadOnlyIf>,</#if>
+    statusBarFields: this.statusBarFields<#if data.fieldHandler.hasFieldsWithReadOnlyIf || data.fieldHandler.hasFieldsWithShowIf>,</#if>
     </#if>
     
 <#--
     // except for the fields all other form properties should be added to the formProperties
     // the formProperties are re-used for inline grid editing
 -->
-   <#if data.fieldHandler.hasFieldsWithReadOnlyIf>
+   <#if data.fieldHandler.hasFieldsWithReadOnlyIf || data.fieldHandler.hasFieldsWithShowIf>
     obFormProperties: {
       onFieldChanged: function(form, item, value) {
         var f = form || this,
@@ -39,11 +39,36 @@
             disabledFields, i;
             OB.Utilities.fixNull250(currentValues);
         <#list data.fieldHandler.fields as field>
-        <#if field.readOnlyIf != "">
-            f.disableItem('${field.name}', ${field.readOnlyIf});
+        <#if field.readOnlyIf != "" && field.showIf == "">
+        // Applying read only.
+           f.disableItem('${field.name}', ${field.readOnlyIf});
+        <#else>
+        <#if field.readOnlyIf == "" && field.showIf != "">
+        // Applying display logic in grid.
+        if (!this.view.isShowingForm) {
+        <#if field.showIf == "false">
+           f.disableItem('${field.name}', true);
+        <#else>
+           f.disableItem('${field.name}', (${field.showIf}) === false);
+        </#if>
+        }
+        <#else>
+        <#if field.readOnlyIf != "" && field.showIf != "">
+        // Applying display logic and read only in grid/form.
+        if (!this.view.isShowingForm) {
+        <#if field.showIf == "false">
+           // If display logic has a false value, it is only necessary take into account the read only logic.
+           f.disableItem('${field.name}', (${field.readOnlyIf}));
+        <#else>
+           f.disableItem('${field.name}', (${field.readOnlyIf}) || (${field.showIf}) === false);
+        </#if>
+        } else {
+           f.disableItem('${field.name}', ${field.readOnlyIf});
+        }
+        </#if>
+        </#if>
         </#if>
         </#list>
-
         // disable forced in case the fields are set as read only per role
         disabledFields = form.view.disabledFields;
         if (disabledFields) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -91,7 +92,16 @@
 
   public boolean getHasFieldsWithReadOnlyIf() {
     for (OBViewFieldDefinition viewField : getFields()) {
-      if (viewField.getReadOnlyIf() != null && viewField.getReadOnlyIf().trim().length() > 0) {
+      if (StringUtils.isNotBlank(viewField.getReadOnlyIf())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public boolean getHasFieldsWithShowIf() {
+    for (OBViewFieldDefinition viewField : getFields()) {
+      if (StringUtils.isNotBlank(viewField.getShowIf())) {
         return true;
       }
     }
@@ -473,6 +483,12 @@
         continue;
       }
 
+      if (!field.isActive()) {
+        // If the field is not marked as active then is not shown in status bar
+        // See issue https://issues.openbravo.com/view.php?id=30825
+        continue;
+      }
+
       final Property property;
       if (field.getProperty() != null) {
         property = DalUtil.getPropertyFromPath(entity, field.getProperty());
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -206,14 +206,16 @@
 
     public void addListValueReference(org.openbravo.model.ad.domain.List listValue) {
       String name = listValue.getName();
-      final String languageId = OBContext.getOBContext().getLanguage().getId();
-      for (ListTrl listTrl : listValue.getADListTrlList()) {
-        if (!listTrl.isActive()) {
-          continue;
-        }
-        if (DalUtil.getId(listTrl.getLanguage()).equals(languageId)) {
-          name = listTrl.getName();
-          break;
+      if (OBContext.hasTranslationInstalled()) {
+        final String languageId = OBContext.getOBContext().getLanguage().getId();
+        for (ListTrl listTrl : listValue.getADListTrlList()) {
+          if (!listTrl.isActive()) {
+            continue;
+          }
+          if (DalUtil.getId(listTrl.getLanguage()).equals(languageId)) {
+            name = listTrl.getName();
+            break;
+          }
         }
       }
       final ValueMapValue vmv = new ValueMapValue(listValue.getSearchKey(), name,
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU 
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -464,11 +464,13 @@
 
   public String getTabTitle() {
     if (tabTitle == null) {
-      final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
-      for (TabTrl tabTrl : tab.getADTabTrlList()) {
-        final String trlLanguageId = (String) DalUtil.getId(tabTrl.getLanguage());
-        if (trlLanguageId.equals(userLanguageId)) {
-          tabTitle = tabTrl.getName();
+      if (OBContext.hasTranslationInstalled()) {
+        final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
+        for (TabTrl tabTrl : tab.getADTabTrlList()) {
+          final String trlLanguageId = (String) DalUtil.getId(tabTrl.getLanguage());
+          if (trlLanguageId.equals(userLanguageId)) {
+            tabTitle = tabTrl.getName();
+          }
         }
       }
       if (tabTitle == null) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java	Mon Dec 21 16:26:08 2015 +0100
@@ -18,7 +18,6 @@
  */
 package org.openbravo.client.application.window;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.codehaus.jettison.json.JSONException;
@@ -133,16 +132,18 @@
    */
   private static String getLabel(BaseOBObject owner, List<?> trlObjects,
       String primaryPropertyName, String secondaryPropertyName) {
-    final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
-    for (Object o : trlObjects) {
-      final BaseOBObject trlObject = (BaseOBObject) o;
-      final String trlLanguageId = (String) DalUtil
-          .getId(trlObject.get(FieldTrl.PROPERTY_LANGUAGE));
-      if (trlLanguageId.equals(userLanguageId)) {
-        if (secondaryPropertyName == null || trlObject.get(primaryPropertyName) != null) {
-          return (String) trlObject.get(primaryPropertyName);
+    if (OBContext.hasTranslationInstalled()) {
+      final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
+      for (Object o : trlObjects) {
+        final BaseOBObject trlObject = (BaseOBObject) o;
+        final String trlLanguageId = (String) DalUtil.getId(trlObject
+            .get(FieldTrl.PROPERTY_LANGUAGE));
+        if (trlLanguageId.equals(userLanguageId)) {
+          if (secondaryPropertyName == null || trlObject.get(primaryPropertyName) != null) {
+            return (String) trlObject.get(primaryPropertyName);
+          }
+          return (String) trlObject.get(secondaryPropertyName);
         }
-        return (String) trlObject.get(secondaryPropertyName);
       }
     }
 
@@ -186,237 +187,182 @@
    * @return the grid configuration
    */
   private static JSONObject getGridConfigurationSettings(Field field, Tab tab) {
-    Boolean canSort = null;
-    Boolean canFilter = null;
-    Boolean filterOnChange = null;
-    Boolean lazyFiltering = null;
-    Boolean allowFkFilterByIdentifier = null;
-    Boolean showFkDropdownUnfiltered = null;
-    Boolean disableFkDropdown = null;
-    String operator = null;
-    Long thresholdToFilter = null;
-    JSONObject result = new JSONObject();
+    GridConfigSettings settings = new GridConfigSettings();
 
-    if (field != null && field.getId() != null) {
-      if (canSort == null || canFilter == null || operator == null || filterOnChange == null
-          || thresholdToFilter == null || allowFkFilterByIdentifier == null
-          || showFkDropdownUnfiltered == null || disableFkDropdown == null) {
-        List<Object> fieldParams = new ArrayList<Object>();
-        String fieldConfsHql = " as p where p.field.id = ? ";
-        fieldParams.add(field.getId());
-        // Trying to get parameters from "Grid Configuration (Tab/Field)" -> "Field" window
-        List<GCField> fieldConfs = OBDal.getInstance()
-            .createQuery(GCField.class, fieldConfsHql, fieldParams).list();
-        if (!fieldConfs.isEmpty()) {
-          if (canSort == null) {
-            if ("Y".equals(fieldConfs.get(0).getSortable())) {
-              canSort = true;
-            } else if ("N".equals(fieldConfs.get(0).getSortable())) {
-              canSort = false;
-            }
-          }
-          if (canFilter == null) {
-            if ("Y".equals(fieldConfs.get(0).getFilterable())) {
-              canFilter = true;
-            } else if ("N".equals(fieldConfs.get(0).getFilterable())) {
-              canFilter = false;
-            }
-          }
-          if (operator == null) {
-            if (fieldConfs.get(0).getTextFilterBehavior() != null
-                && !"D".equals(fieldConfs.get(0).getTextFilterBehavior())) {
-              operator = fieldConfs.get(0).getTextFilterBehavior();
-            }
-          }
-          if (filterOnChange == null) {
-            if ("Y".equals(fieldConfs.get(0).getFilterOnChange())) {
-              filterOnChange = true;
-            } else if ("N".equals(fieldConfs.get(0).getFilterOnChange())) {
-              filterOnChange = false;
-            }
-          }
-          if (allowFkFilterByIdentifier == null) {
-            if ("Y".equals(fieldConfs.get(0).getAllowFilterByIdentifier())) {
-              allowFkFilterByIdentifier = true;
-            } else if ("N".equals(fieldConfs.get(0).getAllowFilterByIdentifier())) {
-              allowFkFilterByIdentifier = false;
-            }
-          }
-          if (showFkDropdownUnfiltered == null) {
-            if ("Y".equals(fieldConfs.get(0).getIsFkDropdownUnfiltered())) {
-              showFkDropdownUnfiltered = true;
-            } else if ("N".equals(fieldConfs.get(0).getIsFkDropdownUnfiltered())) {
-              showFkDropdownUnfiltered = false;
-            }
-          }
-          if (disableFkDropdown == null) {
-            if ("Y".equals(fieldConfs.get(0).getDisableFkCombo())) {
-              disableFkDropdown = true;
-            } else if ("N".equals(fieldConfs.get(0).getDisableFkCombo())) {
-              disableFkDropdown = false;
-            }
-          }
-          if (thresholdToFilter == null) {
-            thresholdToFilter = fieldConfs.get(0).getThresholdToFilter();
-          }
+    GCTab tabConf = null;
+    for (GCTab t : tab.getOBUIAPPGCTabList()) {
+      tabConf = t;
+      break;
+    }
+
+    if (tabConf != null && field != null && field.getId() != null) {
+      GCField fieldConf = null;
+      for (GCField fc : tabConf.getOBUIAPPGCFieldList()) {
+        // field list is cached in memory, so can be reused for all fields without the need of reach
+        // DB again
+        if (DalUtil.getId(fc.getField()).equals(DalUtil.getId(field))) {
+          fieldConf = fc;
+          break;
         }
       }
+
+      // Trying to get parameters from "Grid Configuration (Tab/Field)" -> "Field" window
+      if (fieldConf != null) {
+        settings.processConfig(fieldConf);
+      }
     }
 
-    if (canSort == null || canFilter == null || operator == null || filterOnChange == null
-        || thresholdToFilter == null || allowFkFilterByIdentifier == null
-        || showFkDropdownUnfiltered == null) {
-      List<Object> tabParams = new ArrayList<Object>();
-      String tabConfsHql = " as p where p.tab.id = ? ";
-      tabParams.add(tab.getId());
+    if (tabConf != null && settings.shouldContinueProcessing()) {
       // Trying to get parameters from "Grid Configuration (Tab/Field)" -> "Tab" window
-      List<GCTab> tabConfs = OBDal.getInstance().createQuery(GCTab.class, tabConfsHql, tabParams)
-          .list();
-      if (!tabConfs.isEmpty()) {
-        if (canSort == null) {
-          if ("Y".equals(tabConfs.get(0).getSortable())) {
-            canSort = true;
-          } else if ("N".equals(tabConfs.get(0).getSortable())) {
-            canSort = false;
+      settings.processConfig(tabConf);
+    }
+
+    if (settings.shouldContinueProcessing()) {
+      // Trying to get parameters from "Grid Configuration (System)" window
+      List<GCSystem> sysConfs = OBDal.getInstance().createQuery(GCSystem.class, "").list();
+      if (!sysConfs.isEmpty()) {
+        settings.processConfig(sysConfs.get(0));
+      }
+    }
+
+    return settings.processJSONResult();
+  }
+
+  private static class GridConfigSettings {
+    private Boolean canSort = null;
+    private Boolean canFilter = null;
+    private Boolean filterOnChange = null;
+    private Boolean lazyFiltering = null;
+    private Boolean allowFkFilterByIdentifier = null;
+    private Boolean showFkDropdownUnfiltered = null;
+    private Boolean disableFkDropdown = null;
+    private String operator = null;
+    private Long thresholdToFilter = null;
+
+    private boolean shouldContinueProcessing() {
+      return canSort == null || canFilter == null || operator == null || filterOnChange == null
+          || thresholdToFilter == null || allowFkFilterByIdentifier == null
+          || showFkDropdownUnfiltered == null || disableFkDropdown == null || lazyFiltering == null;
+    }
+
+    private Boolean convertBoolean(BaseOBObject gcItem, String property) {
+      Boolean isPropertyEnabled = true;
+      Class<? extends BaseOBObject> itemClass = gcItem.getClass();
+      try {
+        if (gcItem instanceof GCSystem) {
+          if (gcItem.get(itemClass.getField(property).get(gcItem).toString()).equals(true)) {
+            isPropertyEnabled = true;
+          } else if (gcItem.get(itemClass.getField(property).get(gcItem).toString()).equals(false)) {
+            isPropertyEnabled = false;
+          }
+        } else {
+          if ("Y".equals(gcItem.get(itemClass.getField(property).get(gcItem).toString()))) {
+            isPropertyEnabled = true;
+          } else if ("N".equals(gcItem.get(itemClass.getField(property).get(gcItem).toString()))) {
+            isPropertyEnabled = false;
+          } else if ("D".equals(gcItem.get(itemClass.getField(property).get(gcItem).toString()))) {
+            isPropertyEnabled = null;
           }
         }
+      } catch (Exception e) {
+        log.error("Error while converting a value to boolean", e);
+      }
+      return isPropertyEnabled;
+    }
+
+    private void processConfig(BaseOBObject gcItem) {
+      Class<? extends BaseOBObject> itemClass = gcItem.getClass();
+      try {
+        if (canSort == null) {
+          canSort = convertBoolean(gcItem, "PROPERTY_SORTABLE");
+        }
         if (canFilter == null) {
-          if ("Y".equals(tabConfs.get(0).getFilterable())) {
-            canFilter = true;
-          } else if ("N".equals(tabConfs.get(0).getFilterable())) {
-            canFilter = false;
-          }
+          canFilter = convertBoolean(gcItem, "PROPERTY_FILTERABLE");
         }
         if (operator == null) {
-          if (tabConfs.get(0).getTextFilterBehavior() != null
-              && !"D".equals(tabConfs.get(0).getTextFilterBehavior())) {
-            operator = tabConfs.get(0).getTextFilterBehavior();
+          if (gcItem.get(itemClass.getField("PROPERTY_TEXTFILTERBEHAVIOR").get(gcItem).toString()) != null
+              && !"D".equals(gcItem.get(itemClass.getField("PROPERTY_TEXTFILTERBEHAVIOR")
+                  .get(gcItem).toString()))) {
+            operator = (String) gcItem.get(itemClass.getField("PROPERTY_TEXTFILTERBEHAVIOR")
+                .get(gcItem).toString());
           }
         }
         if (filterOnChange == null) {
-          if ("Y".equals(tabConfs.get(0).getFilterOnChange())) {
-            filterOnChange = true;
-          } else if ("N".equals(tabConfs.get(0).getFilterOnChange())) {
-            filterOnChange = false;
-          }
-        }
-        if (lazyFiltering == null) {
-          if ("Y".equals(tabConfs.get(0).getIsLazyFiltering())) {
-            lazyFiltering = true;
-          } else if ("N".equals(tabConfs.get(0).getIsLazyFiltering())) {
-            lazyFiltering = false;
-          }
+          filterOnChange = convertBoolean(gcItem, "PROPERTY_FILTERONCHANGE");
         }
         if (allowFkFilterByIdentifier == null) {
-          if ("Y".equals(tabConfs.get(0).getAllowFilterByIdentifier())) {
-            allowFkFilterByIdentifier = true;
-          } else if ("N".equals(tabConfs.get(0).getAllowFilterByIdentifier())) {
-            allowFkFilterByIdentifier = false;
-          }
+          allowFkFilterByIdentifier = convertBoolean(gcItem, "PROPERTY_ALLOWFILTERBYIDENTIFIER");
         }
         if (showFkDropdownUnfiltered == null) {
-          if ("Y".equals(tabConfs.get(0).getIsFkDropDownUnfiltered())) {
-            showFkDropdownUnfiltered = true;
-          } else if ("N".equals(tabConfs.get(0).getIsFkDropDownUnfiltered())) {
-            showFkDropdownUnfiltered = false;
-          }
+          showFkDropdownUnfiltered = convertBoolean(gcItem, "PROPERTY_ISFKDROPDOWNUNFILTERED");
         }
         if (disableFkDropdown == null) {
-          if ("Y".equals(tabConfs.get(0).getDisableFkCombo())) {
-            disableFkDropdown = true;
-          } else if ("N".equals(tabConfs.get(0).getDisableFkCombo())) {
-            disableFkDropdown = false;
-          }
+          disableFkDropdown = convertBoolean(gcItem, "PROPERTY_DISABLEFKCOMBO");
         }
         if (thresholdToFilter == null) {
-          thresholdToFilter = tabConfs.get(0).getThresholdToFilter();
+          thresholdToFilter = (Long) gcItem.get(itemClass.getField("PROPERTY_THRESHOLDTOFILTER")
+              .get(gcItem).toString());
         }
+        if (lazyFiltering == null && !(gcItem instanceof GCField)) {
+          lazyFiltering = convertBoolean(gcItem, "PROPERTY_ISLAZYFILTERING");
+        }
+      } catch (Exception e) {
+        log.error("Error while getting the properties of " + gcItem, e);
       }
     }
 
-    if (canSort == null || canFilter == null || operator == null || filterOnChange == null
-        || thresholdToFilter == null || showFkDropdownUnfiltered == null) {
-      // Trying to get parameters from "Grid Configuration (System)" window
-      List<GCSystem> sysConfs = OBDal.getInstance().createQuery(GCSystem.class, "").list();
-      if (!sysConfs.isEmpty()) {
-        if (canSort == null) {
-          canSort = sysConfs.get(0).isSortable();
-        }
-        if (canFilter == null) {
-          canFilter = sysConfs.get(0).isFilterable();
-        }
-        if (operator == null) {
-          operator = sysConfs.get(0).getTextFilterBehavior();
-        }
-        if (filterOnChange == null) {
-          filterOnChange = sysConfs.get(0).isFilterOnChange();
-        }
-        if (lazyFiltering == null) {
-          lazyFiltering = sysConfs.get(0).isLazyFiltering();
-        }
-        if (thresholdToFilter == null) {
-          thresholdToFilter = sysConfs.get(0).getThresholdToFilter();
-        }
-        if (allowFkFilterByIdentifier == null) {
-          allowFkFilterByIdentifier = sysConfs.get(0).isAllowFilterByIdentifier();
-        }
-        if (showFkDropdownUnfiltered == null) {
-          showFkDropdownUnfiltered = sysConfs.get(0).isFkDropDownUnfiltered();
-        }
-        if (disableFkDropdown == null) {
-          disableFkDropdown = sysConfs.get(0).isDisableFkCombo();
+    public JSONObject processJSONResult() {
+      if (operator != null) {
+        if ("IC".equals(operator)) {
+          operator = "iContains";
+        } else if ("IS".equals(operator)) {
+          operator = "iStartsWith";
+        } else if ("IE".equals(operator)) {
+          operator = "iEquals";
+        } else if ("C".equals(operator)) {
+          operator = "contains";
+        } else if ("S".equals(operator)) {
+          operator = "startsWith";
+        } else if ("E".equals(operator)) {
+          operator = "equals";
         }
       }
+
+      JSONObject result = new JSONObject();
+      try {
+        if (canSort != null) {
+          result.put("canSort", canSort);
+        }
+        if (canFilter != null) {
+          result.put("canFilter", canFilter);
+        }
+        if (operator != null) {
+          result.put("operator", operator);
+        }
+        // If the tab uses lazy filtering, the fields should not filter on change
+        if (Boolean.TRUE.equals(lazyFiltering)) {
+          filterOnChange = false;
+        }
+        if (filterOnChange != null) {
+          result.put("filterOnChange", filterOnChange);
+        }
+        if (thresholdToFilter != null) {
+          result.put("thresholdToFilter", thresholdToFilter);
+        }
+        if (allowFkFilterByIdentifier != null) {
+          result.put("allowFkFilterByIdentifier", allowFkFilterByIdentifier);
+        }
+        if (showFkDropdownUnfiltered != null) {
+          result.put("showFkDropdownUnfiltered", showFkDropdownUnfiltered);
+        }
+        if (disableFkDropdown != null) {
+          result.put("disableFkDropdown", disableFkDropdown);
+        }
+      } catch (JSONException e) {
+        log.error("Couldn't get field property value", e);
+      }
+
+      return result;
     }
-
-    if (operator != null) {
-      if ("IC".equals(operator)) {
-        operator = "iContains";
-      } else if ("IS".equals(operator)) {
-        operator = "iStartsWith";
-      } else if ("IE".equals(operator)) {
-        operator = "iEquals";
-      } else if ("C".equals(operator)) {
-        operator = "contains";
-      } else if ("S".equals(operator)) {
-        operator = "startsWith";
-      } else if ("E".equals(operator)) {
-        operator = "equals";
-      }
-    }
-
-    try {
-      if (canSort != null) {
-        result.put("canSort", canSort);
-      }
-      if (canFilter != null) {
-        result.put("canFilter", canFilter);
-      }
-      if (operator != null) {
-        result.put("operator", operator);
-      }
-      // If the tab uses lazy filtering, the fields should not filter on change
-      if (Boolean.TRUE.equals(lazyFiltering)) {
-        filterOnChange = false;
-      }
-      if (filterOnChange != null) {
-        result.put("filterOnChange", filterOnChange);
-      }
-      if (thresholdToFilter != null) {
-        result.put("thresholdToFilter", thresholdToFilter);
-      }
-      if (allowFkFilterByIdentifier != null) {
-        result.put("allowFkFilterByIdentifier", allowFkFilterByIdentifier);
-      }
-      if (showFkDropdownUnfiltered != null) {
-        result.put("showFkDropdownUnfiltered", showFkDropdownUnfiltered);
-      }
-      if (disableFkDropdown != null) {
-        result.put("disableFkDropdown", disableFkDropdown);
-      }
-    } catch (JSONException e) {
-      log.error("Couldn't get field property value");
-    }
-    return result;
   }
 }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -37,6 +37,7 @@
   showCellContextMenus: true,
   selectOnEdit: false,
   dataPageSize: 100,
+  isRefreshing: false,
 
   arrowKeyAction: 'select',
 
@@ -125,7 +126,7 @@
       items: []
     });
 
-    OB.Datasource.get('ADAlert', this, null, true);
+    OB.Datasource.get('DB9F062472294F12A0291A7BD203F922', this, null, true);
 
     this.Super('initWidget', arguments);
   },
@@ -155,6 +156,11 @@
 
   dataArrived: function (startRow, endRow) {
     this.getGridTotalRows();
+    // we notify the data arrival so the view can check if the refresh button can be enabled
+    if (this.isRefreshing) {
+      this.isRefreshing = false;
+      OB.AlertManagement.notifyRefreshEnd();
+    }
     return this.Super('dataArrived', arguments);
   },
 
@@ -165,7 +171,7 @@
     if (!OB.AlertManagement.sections[this.alertStatus].expanded) {
       // fetch to the datasource with an empty criteria to get all the rows
       requestProperties.params = requestProperties.params || {};
-      requestProperties.params[OB.Constants.WHERE_PARAMETER] = this.getFilterClause();
+      requestProperties.params._alertStatus = this.alertStatus;
       requestProperties.params._startRow = 0;
       requestProperties.params._endRow = this.dataPageSize;
       requestProperties.clientContext = {
@@ -180,70 +186,19 @@
     }
   },
 
+  getFetchRequestParams: function (params) {
+    // include alertStatus in the request in order to identify the grid being filtered
+    // this allows to display the correct values on the Alert Rule filter drop-down
+    params = params || {};
+    params._alertStatus = this.alertStatus;
+    return params;
+  },
+
   onFetchData: function (criteria, requestProperties) {
     requestProperties = requestProperties || {};
     requestProperties.params = requestProperties.params || {};
 
-    requestProperties.params[OB.Constants.WHERE_PARAMETER] = this.getFilterClause();
-  },
-
-  getAlertsWithFilterClause: function (alertRule) {
-    var filterClause, alerts = alertRule.alerts.split(','),
-        alertsNum = alerts.length,
-        i, chunksOfAlerts = [],
-        j, chunkSize = 1000;
-    filterClause = ' and (e.alertRule.id != \'' + alertRule.alertRuleId + '\'';
-
-    if (alertsNum <= chunkSize) {
-      filterClause += ' or e.id in (' + alertRule.alerts + '))';
-      return filterClause;
-    }
-
-    // there are more than 1000 alerts to include in the where clause, Oracle doesn't
-    // support it, so let's split them in chunks with <=1000 elements each
-    for (i = 0; i < alertsNum; i += chunkSize) {
-      chunksOfAlerts.push(alerts.slice(i, i + chunkSize));
-    }
-
-    for (i = 0; i < chunksOfAlerts.length; i++) {
-      filterClause += ' or e.id in (';
-      for (j = 0; j < chunksOfAlerts[i].length; j++) {
-        filterClause += j > 0 ? ',' : '';
-        filterClause += chunksOfAlerts[i][j];
-      }
-      filterClause += ')';
-    }
-    filterClause += ')';
-    return filterClause;
-  },
-
-  getFilterClause: function () {
-    var i, filterClause = '',
-        alertRuleIds = '',
-        arlength = OB.AlertManagement.alertRules.length,
-        whereClause = 'coalesce(to_char(status), \'NEW\') = upper(\'' + this.alertStatus + '\')';
-
-    for (i = 0; i < arlength; i++) {
-      if (alertRuleIds !== '') {
-        alertRuleIds += ',';
-      }
-      alertRuleIds += '\'' + OB.AlertManagement.alertRules[i].alertRuleId + '\'';
-      // if an alertRule has some alerts to filter by, add them to the where clause as:
-      // alerts are of a different alertRule or only the alerts predefined
-      // this only happens if the alertRule has an SQL filter expression defined
-      if (OB.AlertManagement.alertRules[i].alerts) {
-        filterClause += this.getAlertsWithFilterClause(OB.AlertManagement.alertRules[i]);
-      }
-    }
-    if (alertRuleIds !== '') {
-      whereClause += ' and e.alertRule.id in (' + alertRuleIds + ')';
-    } else {
-      whereClause += ' and 1=2';
-    }
-    if (filterClause !== '') {
-      whereClause += filterClause;
-    }
-    return whereClause;
+    requestProperties.params._alertStatus = this.alertStatus;
   },
 
   headerClick: function (fieldNum, header, autoSaveDone) {
@@ -558,12 +513,7 @@
     this.setTitle(this.grid.formatLinkValue(this.record, this.field, this.colNum, this.rowNum, this.record[this.field.name]));
   },
   doAction: function () {
-    var i, tabId, length = OB.AlertManagement.alertRules.length;
-    for (i = 0; i < length; i++) {
-      if (OB.AlertManagement.alertRules[i].alertRuleId === this.record.alertRule) {
-        tabId = OB.AlertManagement.alertRules[i].tabId;
-      }
-    }
+    var tabId = this.record['alertRule' + OB.Constants.FIELDSEPARATOR + 'tab' + OB.Constants.FIELDSEPARATOR + OB.Constants.ID];
     if (tabId && tabId !== '') {
       OB.Utilities.openDirectTab(tabId, this.record.referenceSearchKey);
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,7 +38,6 @@
   sectionStack: null,
   grids: {},
   sections: {},
-  alertRules: null,
   //Section header controls:
   NewAcknowledged: null,
   NewSuppressed: null,
@@ -74,9 +73,11 @@
       }
     }, 'setTranslatedStatus');
 
+    this.refreshButton = isc.OBToolbarIconButton.create(isc.OBToolbar.REFRESH_BUTTON_PROPERTIES);
+
     this.addMember(isc.OBToolbar.create({
       view: this,
-      leftMembers: [isc.OBToolbarIconButton.create(isc.OBToolbar.REFRESH_BUTTON_PROPERTIES)],
+      leftMembers: [this.refreshButton],
       rightMembers: []
     }));
 
@@ -84,7 +85,7 @@
     this.addMember(this.sectionStack);
 
     this.Super('initWidget', arguments);
-    this.getAlertRules();
+    OB.AlertManagement.checkInitializeStatus();
   },
 
   tabSelected: function (tabNum, tabPane, ID, tab) {
@@ -97,20 +98,9 @@
     }
   },
 
-  getAlertRules: function () {
-    var post = {
-      'eventType': 'getAlertRules'
-    };
-
-    OB.RemoteCallManager.call('org.openbravo.client.application.AlertManagementActionHandler', post, {}, function (rpcResponse, data, rpcRequest) {
-      OB.AlertManagement.alertRules = data.alertRules;
-      OB.AlertManagement.checkInitializeStatus();
-    });
-  },
-
   checkInitializeStatus: function () {
-    if (OB.AlertManagement.translatedStatus.New !== '' && OB.AlertManagement.translatedStatus.Acknowledged !== '' && OB.AlertManagement.translatedStatus.Suppressed !== '' && OB.AlertManagement.translatedStatus.Solved !== '' && OB.AlertManagement.alertRules !== null) {
-      // Sections are created after alertRules are created and status translations are set.
+    if (OB.AlertManagement.translatedStatus.New !== '' && OB.AlertManagement.translatedStatus.Acknowledged !== '' && OB.AlertManagement.translatedStatus.Suppressed !== '' && OB.AlertManagement.translatedStatus.Solved !== '' && OB.AlertManagement.sectionStack) {
+      // Sections are created after status translations are set.
       // This is needed to be able to filter properly the grids of the sections.
       OB.AlertManagement.createSections();
     }
@@ -280,6 +270,22 @@
       if (!OB.AlertManagement.sections[alertStatus[i]].expanded) {
         OB.AlertManagement.grids[alertStatus[i]].getGridTotalRows();
       }
+      if (OB.AlertManagement.grids[alertStatus[i]].isDrawn()) {
+        OB.AlertManagement.grids[alertStatus[i]].isRefreshing = true;
+      }
+    }
+  },
+
+  notifyRefreshEnd: function () {
+    var i, alertStatus = ['New', 'Acknowledged', 'Suppressed', 'Solved'];
+    for (i = 0; i < 4; i++) {
+      if (OB.AlertManagement.grids[alertStatus[i]].isRefreshing) {
+        return;
+      }
+    }
+    if (this.isRefreshing) {
+      delete this.isRefreshing;
+      this.refreshButton.setDisabled(false);
     }
   }
 });
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Mon Dec 21 16:26:08 2015 +0100
@@ -457,7 +457,6 @@
   clearFilterValues: function () {
     this.singleDateValue = null;
     this.singleDateDisplayValue = '';
-    this.singleDateMode = true;
     this.rangeItemValue = null;
     this.rangeItem.setValue(null);
     this.setElementValue('', '');
@@ -476,6 +475,9 @@
     this.singleDateDisplayValue = displayValue;
     this.singleDateMode = true;
     this.setElementValue(displayValue, displayValue);
+    // Use setValue() to prevent the clearing of the filter when reapplying the criteria of the form
+    // See issue https://issues.openbravo.com/view.php?id=31705
+    this.setValue(displayValue);
   },
 
   blur: function () {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2012 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -37,6 +37,14 @@
     }
   },
 
+  handleEditorExit: function () {
+    if (this.isBeingDestroyed) {
+      return;
+    } else {
+      this.Super('handleEditorExit', arguments);
+    }
+  },
+
   // is needed because addUnknownValues is false
   isUnknownValue: function (enteredValue) {
     var i, vm = this.getValueMap();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Mon Dec 21 16:26:08 2015 +0100
@@ -1592,6 +1592,7 @@
     }
 
     this.view.standardWindow.setDirtyEditForm(null);
+    this.view.clearTargetRecordInWindow();
   },
 
   autoSave: function (parameters) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Mon Dec 21 16:26:08 2015 +0100
@@ -933,6 +933,10 @@
     return this.Super('getCellAlign', arguments);
   },
 
+  getFieldByName: function (fieldName) {
+    return this.getFields().find('name', fieldName);
+  },
+
   // overridden to support hover on the header for the checkbox field
   setFieldProperties: function (field, properties) {
     var localField = field;
@@ -1143,6 +1147,22 @@
     }
   },
 
+  viewHasFieldsNotInGrid: function (viewGridDefinition) {
+    var state = this.evalViewState(viewGridDefinition, 'viewState'),
+        i;
+    if (state && state.field) {
+      var viewGridDefinitionFields = isc.JSON.decode(state.field) || [];
+      for (i = 0; i < viewGridDefinitionFields.length; i++) {
+        var name = viewGridDefinitionFields[i].name;
+        var isVisible = viewGridDefinitionFields[i].visible;
+        if (isVisible !== false && !this.getFieldByName(name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  },
+
   // loads the foreign key filter auxiliary cache of all the filter fields that were using the 'id' filter type when the view was saved
   loadFilterAuxiliaryCache: function (filterAuxCache) {
     var i, cacheElement, filterField;
@@ -1422,6 +1442,9 @@
     ksAction_CancelEditing = function () {
       if (me.getEditForm()) {
         me.cancelEditing();
+        // force update of toolbar buttons state
+        // https://issues.openbravo.com/view.php?id=31567
+        me.view.toolBar.updateButtonState(true);
         return false; // To avoid keyboard shortcut propagation
       } else {
         return true;
@@ -3255,7 +3278,8 @@
     var localArguments = arguments,
         editForm = this.getEditForm(),
         totalRows, me = this,
-        record = this.getRecord(rowNum);
+        record = this.getRecord(rowNum),
+        selectedRecord = this.getSelectedRecord();
 
     if (record) {
       this.removeRecordFromValidationErrorList(record);
@@ -3292,6 +3316,11 @@
 
       // remove the record if new
       if (record && record._new) {
+        // after cancelling a not saved record, the value for the selected record should be cleared
+        // see issue https://issues.openbravo.com/view.php?id=31434
+        if (me.selection && selectedRecord) {
+          me.selection.deselect(selectedRecord);
+        }
         totalRows = me.data.totalRows;
         me.data.handleUpdate('remove', [{
           id: record.id
@@ -3370,7 +3399,7 @@
     }
 
 
-    if (this.getEditForm().dynamicCols) {
+    if (this.getEditForm() && this.getEditForm().dynamicCols) {
       for (i = 0; i < this.getEditForm().dynamicCols.length; i++) {
         if (this.getEditForm().dynamicCols[i] === focusItem.inpColumnName) {
           isDynamicCol = true;
@@ -3379,7 +3408,7 @@
       }
     }
 
-    if (newRow && this.getEditForm().isNew && this.getEditForm().inFicCall && isDynamicCol && editCompletionEvent === 'tab' && !ficCallDone) {
+    if (newRow && this.getEditForm() && this.getEditForm().isNew && this.getEditForm().inFicCall && isDynamicCol && editCompletionEvent === 'tab' && !ficCallDone) {
       this.setEditValue(rowNum, 'actionAfterFicReturn', {
         target: this,
         method: this.cellEditEnd,
@@ -3572,6 +3601,7 @@
       return;
     }
     this._hidingInlineEditor = true;
+    this.view.isEditingGrid = false;
     if (record && (rowNum === 0 || rowNum)) {
       if (!this.rowHasErrors(rowNum)) {
         record[this.recordBaseStyleProperty] = null;
@@ -3585,7 +3615,6 @@
       } else {
         isc.Log.logDebug('hideInlineEditor has NO record and editColumnLayout', 'OB');
       }
-      this.view.isEditingGrid = false;
       // Update the tab title after the record has been saved or canceled
       // to get rid of the '*' in the tab title
       // See https://issues.openbravo.com/view.php?id=21709
@@ -4301,6 +4330,9 @@
 
   doCancel: function () {
     this.grid.cancelEditing();
+    // force update of toolbar buttons state
+    // https://issues.openbravo.com/view.php?id=31567
+    this.grid.view.toolBar.updateButtonState(true);
   },
 
   hideMember: function (memberNo) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js	Mon Dec 21 16:26:08 2015 +0100
@@ -114,7 +114,7 @@
       text = newText + '</ul>';
     }
 
-    if ((form && form.isSaving) || (grid && grid.isSaving)) {
+    if (((form && form.isSaving) || (grid && grid.isSaving)) && type === isc.OBMessageBar.TYPE_ERROR) {
       text = OB.I18N.getLabel('OBUIAPP_ErrorSavingFailed') + ' ' + text;
     }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Mon Dec 21 16:26:08 2015 +0100
@@ -1112,6 +1112,12 @@
     }
   },
 
+  clearTargetRecordInWindow: function () {
+    if (this.isActiveView()) {
+      this.standardWindow.clearTargetInformation();
+    }
+  },
+
   setRecentDocument: function (record) {
     var params = this.standardWindow.getBookMarkParams();
     params.targetTabId = this.tabId;
@@ -1837,7 +1843,7 @@
         postFix;
     var suffix = '';
     var hasChanged = this.isShowingForm && (this.viewForm.isNew || this.viewForm.hasChanged);
-    hasChanged = hasChanged || (this.isEditingGrid && (this.viewGrid.hasErrors() || this.viewGrid.getEditForm().isNew || this.viewGrid.getEditForm().hasChanged));
+    hasChanged = hasChanged || (this.isEditingGrid && this.viewGrid.getEditForm() && (this.viewGrid.hasErrors() || this.viewGrid.getEditForm().isNew || this.viewGrid.getEditForm().hasChanged));
     if (hasChanged) {
       prefix = '* ';
     }
@@ -2289,7 +2295,9 @@
     var actionObject = {
       target: this,
       method: this.editRecord,
-      parameters: {isNewDocument: true}
+      parameters: {
+        isNewDocument: true
+      }
     };
     this.standardWindow.doActionAfterAutoSave(actionObject, false);
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Mon Dec 21 16:26:08 2015 +0100
@@ -1237,6 +1237,12 @@
     OB.Layout.HistoryManager.updateHistory();
   },
 
+  clearTargetInformation: function () {
+    this.targetTabId = null;
+    this.targetRecordId = null;
+    OB.Layout.HistoryManager.updateHistory();
+  },
+
   getView: function (tabId) {
     // find is a SC extension on arrays
     return this.views.find('tabId', tabId);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js	Mon Dec 21 16:26:08 2015 +0100
@@ -43,7 +43,7 @@
     return false;
   }
   quantity = new BigDecimal(String(value));
-  if (quantity.compareTo(availableQty.subtract(reservedinothersQty)) > 0) {
+  if (quantity.subtract(releasedQty).compareTo(availableQty.subtract(reservedinothersQty)) > 0) {
     isc.warn(OB.I18N.getLabel('OBUIAPP_Res_MoreQtyThanAvailable', [record.availableQty, record.reservedinothers]));
     return false;
   }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Mon Dec 21 16:26:08 2015 +0100
@@ -183,6 +183,11 @@
   }
 
   if (viewTabDefinition.grid) {
+    // check if the view to be applied adds new fields into the grid
+    // in that case, we invalidate the cache to bring the data of the new fields when refreshing
+    if (view.viewGrid.viewHasFieldsNotInGrid(viewTabDefinition.grid)) {
+      view.viewGrid.invalidateCache();
+    }
     //clear grouping, will be applied later
     view.viewGrid.clearGroupBy();
     view.viewGrid.setViewState(viewTabDefinition.grid);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js	Mon Dec 21 16:26:08 2015 +0100
@@ -36,6 +36,22 @@
     this.paramWindow.handleButtonsStatus();
   },
 
+  setItems: function (itemList) {
+    itemList.forEach(function (item) {
+      item.setValueProgrammatically = function (value) {
+        if (this.setDateParameterValue) {
+          this.setDateParameterValue(value);
+        } else if (this.setValue) {
+          this.setValue(value);
+        }
+        if (this.onChangeFunction && this.view && this.view.theForm) {
+          this.view.theForm.handleItemChange(item);
+        }
+      };
+    });
+    this.Super('setItems', arguments);
+  },
+
   // this function is invoked on the blur action of the formitems
   // this is the proper place to execute the client-side callouts
   handleItemChange: function (item) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js	Mon Dec 21 16:26:08 2015 +0100
@@ -22,7 +22,7 @@
 QUnit.module('org.openbravo.client.application1');
 
 QUnit.test('OB.Utilities.Number. ScientificToDecimal, OBMaskedToOBPlain and roundJSNumber functions', function () {
-  QUnit.expect(6);
+  QUnit.expect(7);
 
   var outputText = '';
   var decSeparator = '.';
@@ -130,6 +130,38 @@
 
   QUnit.ok((function () {
     var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly with numbers with leading zeros';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal does not work properly with numbers with leading zeros';
+    var success = true;
+    var normalizedDisplayFormat0;
+    var normalizedDisplayFormat1;
+    var list = [
+      ['03.4e-2', '3.4e-2'],
+      ['03.4e+2', '3.4e+2'],
+      ['03.4e2', '3.4e2'],
+      ['03.4E-2', '3.4E-2'],
+      ['03.4E+2', '3.4E+2'],
+      ['03.4E2', '3.4E2']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat0 = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      normalizedDisplayFormat1 = OB.Utilities.Number.ScientificToDecimal(list[i][1], decSeparator);
+      if (normalizedDisplayFormat0 !== normalizedDisplayFormat1) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + normalizedDisplayFormat1 + '\' (returned: ' + normalizedDisplayFormat0 + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
     var successText = 'OB.Utilities.Number.ScientificToDecimal works properly';
     var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
     var success = true;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Mon Dec 21 16:26:08 2015 +0100
@@ -1234,11 +1234,7 @@
       }
     }
 
-    if (buttons.length === 0) {
-      if (!noSetSession && this.view.viewGrid && this.view.viewGrid.getSelectedRecord()) {
-        this.view.setContextInfo();
-      }
-    } else {
+    if (buttons.length !== 0) {
       length = buttons.length;
       for (i = 0; i < length; i++) {
         if (!currentContext || currentContext !== buttons[i].contextView) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2012 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -58,7 +58,7 @@
     updateHistory: function () {
 
       var state = {},
-          stateStr, data, i, tabsLength, tab, tabObject;
+          stateStr, data, i, tabsLength, tab, tabObject, tabWidgetNumber, previousWidgetsInTab = 0;
 
       if (L.ViewManager.inStateHandling) {
         return;
@@ -76,28 +76,46 @@
       for (i = 0; i < tabsLength; i++) {
         tab = OB.MainView.TabSet.tabs[i];
 
-        state.bm[i] = {};
+        if (tab.viewName !== 'OBQueryListView' && tab.viewName !== 'OBCalendarWidgetView') {
+          state.bm[i] = {};
 
-        // get the original tab object
-        tabObject = OB.MainView.TabSet.getTabObject(tab);
+          // get the original tab object
+          tabObject = OB.MainView.TabSet.getTabObject(tab);
 
-        state.bm[i] = {
-          viewId: tabObject.viewName
-        };
+          state.bm[i] = {
+            viewId: tabObject.viewName
+          };
 
-        // store the bookmark parameters
-        if (tabObject.pane && tabObject.pane.getBookMarkParams) {
-          state.bm[i].params = tabObject.pane.getBookMarkParams();
-          if (!state.bm[i].params.tabTitle) {
-            state.bm[i].params.tabTitle = tabObject.title;
+          // store the bookmark parameters
+          if (tabObject.pane && tabObject.pane.getBookMarkParams) {
+            state.bm[i].params = tabObject.pane.getBookMarkParams();
+            if (!state.bm[i].params.tabTitle) {
+              state.bm[i].params.tabTitle = tabObject.title;
+            }
+          }
+
+          // let tabs store extra data
+          if (tabObject.pane && tabObject.pane.getState) {
+            data[i] = tabObject.pane.getState();
+          }
+        } else {
+          // Not updating history in case of query-list and calendar widgets
+          // https://issues.openbravo.com/view.php?id=29025
+          tabWidgetNumber = OB.MainView.TabSet.getTabNumber(tab);
+          if (tabWidgetNumber <= state.st) {
+            previousWidgetsInTab = previousWidgetsInTab + 1;
           }
         }
+      }
 
-        // let tabs store extra data
-        if (tabObject.pane && tabObject.pane.getState) {
-          data[i] = tabObject.pane.getState();
-        }
-      }
+      // update the selected tab to be stored in the state
+      // this is because query-list and calendar widgets are not reopened after refreshing
+      state.st = state.st - previousWidgetsInTab;
+
+      // remove possible undefined values from bm array
+      state.bm = state.bm.filter(function (elem) {
+        return elem !== undefined;
+      });
 
       // now encode the state as a json string
       // which is used as a the id in the url
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Mon Dec 21 16:26:08 2015 +0100
@@ -423,6 +423,9 @@
 OB.Utilities.Number.ScientificToDecimal = function (number, decSeparator) {
 
   number = number.toString();
+  // remove leading zeros
+  // see issue https://issues.openbravo.com/view.php?id=28561
+  number = number.replace(/^0+/, '');
   var coeficient, exponent, numberOfZeros, zeros = '',
       i, split, index, sign;
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Mon Dec 21 16:26:08 2015 +0100
@@ -23,7 +23,7 @@
 OB.Utilities = {};
 
 OB.Utilities.isIE9Strict = false;
-if (navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 && (document.documentMode && document.documentMode >= 9)) {
+if ((navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 || navigator.userAgent.toUpperCase().indexOf("TRIDENT") !== -1) && (document.documentMode && document.documentMode >= 9)) {
   OB.Utilities.isIE9Strict = true;
 }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Mon Dec 21 16:26:08 2015 +0100
@@ -351,8 +351,8 @@
 
           if (direct) {
             // set directly opened tab and all its ancestors as directNavigation
-            if (params && params.id) {
-              var tabId = params.id;
+            if (params && (params.id || params.targetTabId)) {
+              var tabId = params.id || params.targetTabId;
 
               if (viewInstance.view && viewInstance.view.tabId === tabId) {
                 viewInstance.view.directNavigation = true;
@@ -455,6 +455,7 @@
               message: 'The view ' + viewName + ' not defined'
             };
           }
+          direct = direct || (params.targetRecordId !== undefined && params.targetRecordId !== null);
           showTab(viewName, params, null, direct);
         }
         if (isc[viewName]) {
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.28148]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.28148]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2014 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -37,6 +37,8 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
+import org.openbravo.base.model.domaintype.BooleanDomainType;
+import org.openbravo.base.model.domaintype.DomainType;
 import org.openbravo.base.model.domaintype.EnumerateDomainType;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.application.Parameter;
@@ -176,7 +178,15 @@
           continue;
         }
         if (parameter.getDefaultValue() != null) {
-          defaultParameters.put(parameter.getDBColumnName(), parameter.getDefaultValue());
+          DomainType domainType = ParameterUtils.getParameterDomainType(parameter);
+          if (domainType.getClass().equals(BooleanDomainType.class)) {
+            // boolean default value for widget parameters is not returned as string but as boolean
+            // see issue https://issues.openbravo.com/view.php?id=29027
+            defaultParameters.put(parameter.getDBColumnName(),
+                getBooleanValueFromString(parameter.getDefaultValue()));
+          } else {
+            defaultParameters.put(parameter.getDBColumnName(), parameter.getDefaultValue());
+          }
         }
         final JSONObject fieldDefinition = new JSONObject();
         fieldDefinition.put(PARAMETERID, parameter.getId());
@@ -441,6 +451,13 @@
     this.widgetClass = widgetClass;
   }
 
+  private boolean getBooleanValueFromString(String value) {
+    if ("true".equals(value) || "Y".equals(value) || "'Y'".equals(value)) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Override this method to make validations on widget classes. If this method returns false the
    * widget class won't be available for users to add new instances.
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2012 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -23,7 +23,7 @@
 //
 isc.defineClass('OBGettingStartedWidget', isc.OBWidget).addProperties({
   contentSource: null,
-  widgetContentUrl: 'https://butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html' + '?uimode=gettingStarted&language=' + OB.Application.language_string,
+  widgetContentUrl: '//butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html' + '?uimode=gettingStarted&language=' + OB.Application.language_string,
   createWindowContents: function () {
     var loc = document.location;
 
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.28148]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Mon Dec 21 16:26:08 2015 +0100
@@ -283,9 +283,10 @@
               if (queryAliases[i].equals(column.getDisplayExpression())
                   || (!isExport && queryAliases[i].equals(column.getLinkExpression()))) {
                 Object value = resultList[i];
-                if (domainType instanceof DateDomainType || domainType instanceof DateDomainType) {
+                if ((domainType instanceof DateDomainType || domainType instanceof DateDomainType)
+                    && value != null) {
                   value = xmlDateFormat.format(value);
-                } else if (value instanceof Timestamp) {
+                } else if (value instanceof Timestamp && value != null) {
                   value = xmlDateTimeFormat.format(value);
                   value = JsonUtils.convertToCorrectXSDFormat((String) value);
                 }
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.27639]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.28148]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.28148]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Mon Dec 21 16:26:08 2015 +0100
@@ -687,8 +687,12 @@
         if (i % 100 == 0) {
           OBDal.getInstance().getSession().clear();
         }
-        OBDal.getInstance().getSession().buildLockRequest(LockOptions.NONE)
-            .lock(FIN_PaymentScheduleDetail.ENTITY_NAME, FIN_PaymentScheduleDetail);
+        OBDal
+            .getInstance()
+            .getSession()
+            .buildLockRequest(LockOptions.NONE)
+            .lock(org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail.ENTITY_NAME,
+                FIN_PaymentScheduleDetail);
 
         // search for fin_finacc_transaction for this payment
         FIN_FinaccTransaction trx = null;
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.27639]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.28148]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.28148]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.28148]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2010-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -180,18 +180,20 @@
       }
     }
 
-    // set the default if no translation found
-    final String hql = "select al.searchKey, trl.name from ADList al, ADListTrl trl where "
-        + " al.reference.id=? and trl.listReference=al and trl.language.id=?"
-        + " and al.active=true and trl.active=true";
-    final Query qry = OBDal.getInstance().getSession().createQuery(hql);
-    qry.setString(0, referenceId);
-    qry.setString(1, userLanguageId);
-    for (Object o : qry.list()) {
-      final Object[] row = (Object[]) o;
-      for (RefListEntry entry : translatedValues) {
-        if (entry.getValue().equalsIgnoreCase((String) row[0])) {
-          entry.setLabel((String) row[1]);
+    if (OBContext.hasTranslationInstalled()) {
+      // set the default if no translation found
+      final String hql = "select al.searchKey, trl.name from ADList al, ADListTrl trl where "
+          + " al.reference.id=? and trl.listReference=al and trl.language.id=?"
+          + " and al.active=true and trl.active=true";
+      final Query qry = OBDal.getInstance().getSession().createQuery(hql);
+      qry.setString(0, referenceId);
+      qry.setString(1, userLanguageId);
+      for (Object o : qry.list()) {
+        final Object[] row = (Object[]) o;
+        for (RefListEntry entry : translatedValues) {
+          if (entry.getValue().equalsIgnoreCase((String) row[0])) {
+            entry.setLabel((String) row[1]);
+          }
         }
       }
     }
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.27639]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.28148]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.28148]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.27639]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.28148]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.27639]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.28148]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Mon Dec 21 16:26:08 2015 +0100
@@ -233,11 +233,11 @@
       if (StringUtils.isNotEmpty(displayProperty)) {
         if (jsonObject.has(displayProperty + DalUtil.FIELDSEPARATOR + JsonConstants.IDENTIFIER)
             && !jsonObject.get(displayProperty + DalUtil.FIELDSEPARATOR + JsonConstants.IDENTIFIER)
-                .equals(jsonObject.NULL)) {
+                .equals(JSONObject.NULL)) {
           jsonObject.put(JsonConstants.IDENTIFIER,
               jsonObject.get(displayProperty + DalUtil.FIELDSEPARATOR + JsonConstants.IDENTIFIER));
         } else if (jsonObject.has(displayProperty)
-            && !jsonObject.get(displayProperty).equals(jsonObject.NULL)) {
+            && !jsonObject.get(displayProperty).equals(JSONObject.NULL)) {
           jsonObject.put(JsonConstants.IDENTIFIER, jsonObject.get(displayProperty));
         }
       }
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Dec 21 16:26:08 2015 +0100
@@ -18,7 +18,6 @@
  */
 package org.openbravo.service.json;
 
-import java.sql.BatchUpdateException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -46,8 +45,10 @@
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.SessionInfo;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.service.db.DbUtility;
 import org.openbravo.service.json.JsonToDataConverter.JsonConversionError;
 import org.openbravo.userinterface.selector.SelectorConstants;
 
@@ -131,7 +132,11 @@
       // if the id is set that's a special case of one object being requested
       if (id != null) {
         bobs = new ArrayList<BaseOBObject>();
-        final BaseOBObject bob = OBDal.getInstance().get(entityName, id);
+        final OBQuery<BaseOBObject> obq = OBDal.getInstance().createQuery(entityName,
+            JsonConstants.ID + " = :bobId");
+        obq.setNamedParameter("bobId", id);
+        obq.setMaxResult(1);
+        final BaseOBObject bob = obq.uniqueResult();
         if (bob != null) {
           bobs.add(bob);
         }
@@ -824,13 +829,12 @@
         return result;
       }
     } catch (Throwable t) {
-      Throwable localThrowable = t;
-      if (localThrowable.getCause() instanceof BatchUpdateException) {
-        final BatchUpdateException batchException = (BatchUpdateException) localThrowable
-            .getCause();
-        localThrowable = batchException.getNextException();
+      Throwable localThrowable = DbUtility.getUnderlyingSQLException(t);
+      if (!(localThrowable instanceof OBException)
+          || (localThrowable instanceof OBException && ((OBException) localThrowable)
+              .isLogExceptionNeeded())) {
+        log.error(localThrowable.getMessage(), localThrowable);
       }
-      log.error(localThrowable.getMessage(), localThrowable);
       return JsonUtils.convertExceptionToJson(localThrowable);
     }
 
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java	Mon Dec 21 16:26:08 2015 +0100
@@ -18,7 +18,6 @@
  */
 package org.openbravo.service.json;
 
-import java.sql.BatchUpdateException;
 import java.sql.SQLTimeoutException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -44,6 +43,7 @@
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.service.db.DalConnectionProvider;
+import org.openbravo.service.db.DbUtility;
 import org.postgresql.util.PSQLException;
 
 /**
@@ -200,11 +200,7 @@
    * @return the resulting json string
    */
   public static String convertExceptionToJson(Throwable throwable) {
-    Throwable localThrowable = throwable;
-    if (throwable.getCause() instanceof BatchUpdateException) {
-      final BatchUpdateException batchException = (BatchUpdateException) throwable.getCause();
-      localThrowable = batchException.getNextException();
-    }
+    Throwable localThrowable = DbUtility.getUnderlyingSQLException(throwable);
 
     try {
       final JSONObject jsonResult = new JSONObject();
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java	Mon Dec 21 16:26:08 2015 +0100
@@ -32,9 +32,10 @@
  * 'Allow Unpaged Datasource Manual Request' preference in cache during the application life cycle,
  * avoiding the time spent to compute the preference value.
  * 
- * This class it is also used by the {@link PreferenceEventHandler} class to detect changes in the
- * preference value, and it that case it invalidates the stored value. This way the next time it is
- * requested, the current value will be retrieved from database again.
+ * This class it is also used by the
+ * {@link org.openbravo.client.application.event.PreferenceEventHandler} class to detect changes in
+ * the preference value, and it that case it invalidates the stored value. This way the next time it
+ * is requested, the current value will be retrieved from database again.
  * 
  * This mechanism for automatic refresh the preference value, only works on environments with a
  * single JVM. In case of Tomcat clustering environments (multiple JVM) it will be necessary to
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.28148]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java	Mon Dec 21 16:26:08 2015 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2014 Openbravo SLU
+ * All portions are Copyright (C) 2009-2015 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -706,6 +706,9 @@
   }
 
   private SelectorFieldTrl getTranslation(SelectorField selectorField) {
+    if (!OBContext.hasTranslationInstalled()) {
+      return null;
+    }
 
     final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
 
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.27639]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.28148]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.27639]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.28148]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Mon Dec 21 16:26:08 2015 +0100
@@ -8654,7 +8654,7 @@
 this.setSelectionRange(_3[0],_3[1])}
 this.clearCompletion()},isc.A.$173y=function isc_FormItem__canSetSelectionRange(){if(!isc.isA.TextItem(this)&&!isc.isA.TextAreaItem(this))return false;return true},isc.A.setSelectionRange=function isc_FormItem_setSelectionRange(_1,_2){if(!isc.isA.TextItem(this)&&!isc.isA.TextAreaItem(this))return;if(!this.isDrawn())return;if(!isc.isA.Number(_1))_1=0;if(!isc.isA.Number(_2))_2=0;if(_1>_2){var _3=_2;_2=_1;_1=_3}
 var _4=this.getDataElement();if(_4==null)return;if(this.logIsInfoEnabled("nativeFocus")&&!this.$820()){this.logInfo("setSelectionRange() about to change focus "+isc.EH.$lb()+(this.logIsDebugEnabled("traceFocus")?this.getStackTrace():""),"nativeFocus")}
-if(isc.Browser.isIE){isc.EH.$904=true;var _5=_4.createTextRange();_5.collapse(true);_5.moveStart(this.$14n,_1);_5.moveEnd(this.$14n,(_2-_1));_5.select();delete isc.EH.$904}else{_4.focus();_4.setSelectionRange(_1,_2)}
+if(isc.Browser.isIE){isc.EH.$904=true;var _5=_4.createTextRange();_5.collapse(true);_5.moveStart(this.$14n,_1);_5.moveEnd(this.$14n,(_2-_1));_5.select();delete isc.EH.$904}else{_4.focus();isc.EH.$904=true;_4.setSelectionRange(_1,_2);return isc.EH.$904}
 if(_2>_1)this.$1161=[_1,_2]},isc.A.selectValue=function isc_FormItem_selectValue(){var _1=this.getElementValue(),_2=isc.isA.String(_1)?_1.length:0;this.setSelectionRange(0,_2)},isc.A.deselectValue=function isc_FormItem_deselectValue(_1){if(!this.hasFocus)return;if(_1)this.setSelectionRange(0,0);else{var _2=this.getElementValue(),_3=isc.isA.String(_2)?_2.length:0;this.setSelectionRange(_3,_3)}},isc.A.getSelectionRange=function isc_FormItem_getSelectionRange(_1){if(!this.$173y())return;if(isc.isA.UploadItem(this))return;var _2=this.getDataElement();if(_2==null)return;if(isc.Browser.isIE&&isc.Browser.version<10){if(!this.$820())return null;var _3=this.$17p();if(_3==null)return null;if(isc.isA.TextAreaItem(this)){if(!this.supportsSelectionRange)return null;var _4=_3.duplicate();_4.moveToElementText(_2);var _5=_4.text.length;_4.setEndPoint(this.$119o,_3);var i=_5-_4.text.length;return[i,i+_3.text.length]}else{var _7=[],_4=_2.createTextRange();if(_4==null)return null;if(_4.compareEndPoints(this.$14o,_3)==0){_7[1]=_4.text.length}else{_4.setEndPoint(this.$14o,_3);_7[1]=_4.text.length}
 _4.setEndPoint(this.$14p,_3);_7[0]=_4.text.length;return _7}}else if(isc.Browser.isMoz||isc.Browser.isSafari||isc.Browser.isOpera||isc.Browser.isIE){return[_2.selectionStart,_2.selectionEnd]}},isc.A.$820=function isc_FormItem__hasNativeFocus(){var _1=this.getFocusElement(),_2=this.getActiveElement();return(_1==_2)},isc.A.getSelectedText=function isc_FormItem_getSelectedText(){if(!isc.isA.TextItem(this)&&!isc.isA.TextAreaItem(this)){return}
 if(isc.Browser.isIE){var _1=this.$17p();if(_1)return _1.text}else if(isc.Browser.isMoz||isc.Browser.isSafari){var _2=this.getElement();if(_2!=null){return _2.value.substring(_2.selectionStart,_2.selectionEnd)}}},isc.A.$100a=function isc_FormItem__IESelectionStuck(){if(!isc.Browser.isIE)return false;try{var _1=document.selection?document.selection.typeDetail:null}catch(e){this.logDebug("Internet explorer native 'stuck focus' state detected");return true}
@@ -9633,7 +9633,8 @@
 return false},isc.A.editorEnter=function isc_ComboBoxItem_editorEnter(_1,_2,_3){this.$66s()},isc.A.editorExit=function isc_ComboBoxItem_editorExit(_1,_2,_3){if(this.$712()&&(_3==null||isc.isAn.emptyString(_3)))
 {this.$66t()}},isc.A.showPicker=function isc_ComboBoxItem_showPicker(){this.focusInItem();this.filterWithValue=false;var _1=this.getEnteredValue(),_2=(!_1||_1==isc.emptyString);this.$84k=_1;this.$200=_2;return this.showPickList()},isc.A.pickValue=function isc_ComboBoxItem_pickValue(_1){this.$66s();var _2=this.mapValueToDisplay(_1);this.setElementValue(_2);if(this.hasFocus)this.selectValue();this.$201=true;this.$66x={};this.$66x[_2]=_1;this.updateValue();delete this.$201},isc.A.setValueMap=function isc_ComboBoxItem_setValueMap(){this.Super("setValueMap",arguments);if(this.pickList){if(this.pickList.isVisible())this.pickList.hide();delete this.pickList.formItem
 this.setUpPickList(this.pickList.isVisible())}
-if(this.addUnknownValues){var _1=this.getDisplayValue();if(isc.isAn.emptyString(_1)&&this.$712()){this.$66t()}else{this.setElementValue(_1)}}},isc.A.setValue=function isc_ComboBoxItem_setValue(_1,_2,_3,_4,_5){var _6=this._value!=_1;if(!_6){if(this.$82t){this.setElementValue(this.$824);return}}
+if(this.addUnknownValues){var _1=this.getDisplayValue();if(isc.isAn.emptyString(_1)&&this.$712()){this.$66t()}else{this.setElementValue(_1)}}},isc.A.setValue=function isc_ComboBoxItem_setValue(_1,_2,_3,_4,_5){var _6=this._value!=_1;if(!_6){if(this.$82t&&(this.$82p!=null||this.hasFocus))
+{this.setElementValue(this.$824);return}}
 this.$82u();this.$43o=true;this.invokeSuper(isc.ComboBoxItem,"setValue",_1,_2,_3,_4,_5);delete this.$43o;if(!this.hasFocus&&this.$712()&&this.getHint()){var _7;if(_1===_7||_1==null||isc.is.emptyString(_1)){this.$66t()}}
 if(_3||_1==null){this.explicitChoice=false}else if(_6){this.explicitChoice=true}},isc.A.getDefaultValue=function isc_ComboBoxItem_getDefaultValue(){var _1=this.Super("getDefaultValue",arguments);if(_1==null&&this.defaultToFirstOption){_1=this.getFirstOptionValue()}
 return _1},isc.A.makePickList=function isc_ComboBoxItem_makePickList(_1){this.$128m(false);if(this.progressiveLoading===true||this.progressiveLoading===false){if(this.pickListProperties==null)this.picklistProperties={};this.picklistProperties.progressiveLoading=this.progressiveLoading}
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Mon Dec 21 16:26:08 2015 +0100
@@ -592,6 +592,7 @@
       this.dataSource.destroy();
       this.dataSource = null;
     }
+    this.isBeingDestroyed = true;
     this._original_destroy();
   },
 
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.28148]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.28148]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.28148]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.28148]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.28148]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.28148]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.28148]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.28148]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.28148]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.28148]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.28148]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.28148]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.28148]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.28148]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.28148]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.28148]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.27639]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.28148]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -37,7 +37,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -57,7 +57,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -77,7 +77,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -137,7 +137,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -157,7 +157,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -177,7 +177,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -197,7 +197,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -217,7 +217,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -237,7 +237,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -277,7 +277,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 </data>
--- a/referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -1,6 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
 <C_GLITEM_ACCT>
+  <C_GLITEM_ACCT_ID><![CDATA[15F491B431AD4283B5E86E0585049179]]></C_GLITEM_ACCT_ID>
+  <C_GLITEM_ID><![CDATA[9325117728F843FE9F77A67886C99541]]></C_GLITEM_ID>
+  <C_ACCTSCHEMA_ID><![CDATA[432EAC71E1B8451E97C7F54718C4A06B]]></C_ACCTSCHEMA_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2015-12-10 19:08:23.87]]></CREATED>
+  <CREATEDBY><![CDATA[4028E6C72959682B01295A0735CB0120]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-12-10 19:08:23.87]]></UPDATED>
+  <UPDATEDBY><![CDATA[4028E6C72959682B01295A0735CB0120]]></UPDATEDBY>
+  <GLITEM_DEBIT_ACCT><![CDATA[01E97409D930479681BC88C1B29453DD]]></GLITEM_DEBIT_ACCT>
+  <GLITEM_CREDIT_ACCT><![CDATA[01E97409D930479681BC88C1B29453DD]]></GLITEM_CREDIT_ACCT>
+</C_GLITEM_ACCT>
+
+<C_GLITEM_ACCT>
+  <C_GLITEM_ACCT_ID><![CDATA[21F99F5FA9A0483C9394ABE596B4E48C]]></C_GLITEM_ACCT_ID>
+  <C_GLITEM_ID><![CDATA[9325117728F843FE9F77A67886C99541]]></C_GLITEM_ID>
+  <C_ACCTSCHEMA_ID><![CDATA[9A68A0F8D72D4580B3EC3CAA00A5E1F0]]></C_ACCTSCHEMA_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2015-12-10 19:08:10.835]]></CREATED>
+  <CREATEDBY><![CDATA[4028E6C72959682B01295A0735CB0120]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-12-10 19:08:10.835]]></UPDATED>
+  <UPDATEDBY><![CDATA[4028E6C72959682B01295A0735CB0120]]></UPDATEDBY>
+  <GLITEM_DEBIT_ACCT><![CDATA[C28D47498AD043EA96D15A29172E2640]]></GLITEM_DEBIT_ACCT>
+  <GLITEM_CREDIT_ACCT><![CDATA[C28D47498AD043EA96D15A29172E2640]]></GLITEM_CREDIT_ACCT>
+</C_GLITEM_ACCT>
+
+<C_GLITEM_ACCT>
   <C_GLITEM_ACCT_ID><![CDATA[33647735E83042AE989A6892FCCFA90A]]></C_GLITEM_ACCT_ID>
   <C_GLITEM_ID><![CDATA[A0D6C0E5C36A4F0EBEA0750466A80C28]]></C_GLITEM_ID>
   <C_ACCTSCHEMA_ID><![CDATA[9A68A0F8D72D4580B3EC3CAA00A5E1F0]]></C_ACCTSCHEMA_ID>
--- a/referencedata/sampledata/QA_Testing/M_COSTING.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/QA_Testing/M_COSTING.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -41,6 +41,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[020C9D99ECE54D76A67BCAB10D1BB0C6]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.604]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.876]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[20.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[20.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[2E451B48396642C5B85EE5A5843C3A42]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[034FF51909054DE9946986D6418E5684]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.818]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.818]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1B800224]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[FF3527BCACF84573AF2D476174832AB2]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[066DB851370840DEB7C280D26DDE5034]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.065]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -101,6 +149,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[0928EC5F89DD452DB027E54D2DBA7078]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.688]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.688]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1DC2022E]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[53BB50910FF5417FA7569089CD5C20EC]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[09D053FB51244C0494E6EABA14D17381]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.065]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -121,6 +193,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[0E9C25C8B8544D2AA4250CC4714E1238]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.162]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.162]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC25D10242]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[8BF432FE62B04CD5A4B389E92E6136E3]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[1569808869F5453C8D1FE94160EA2F9A]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.065]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -161,6 +257,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[19C8101F87EE4A42BB6B2FBF83AB177A]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.161]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.161]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1F580233]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[1EE86C1F3354459BBF9608F687510FFB]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[23DB441CDDCF485CB28816CB3B9C4A4B]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.612]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.612]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC24B70240]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E7BD79A96C2443F99F69CA2D76B4482B]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[26537C67F2B24B20B9FDA5A680CABBBE]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -201,6 +345,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[29B8A094C69A42F6ABC9971D4000F7C2]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.917]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.553]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2015-03-12 15:36:59.388897]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[5.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[60.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[9CA0C8838CAB47F6AE8D4E8EC56438E0]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[2A43302D56C945D1B5CC69B1FAB198E2]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.132]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.242]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[1.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[1540F2FAA6474B5495188F911699288A]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[2A7568AF64D048E894CB78621820525A]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -221,6 +413,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[2B4EFECB7AD04EDD9EE9DB21DDD2412B]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.587]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.76]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[5.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[7AB142E5190940E98CAECB7A4214E23B]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[2D0A5E0CAC414A768C3B1A0214C50648]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.977]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.286]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[12.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[12.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[497E3C1AA0BC4590B53E60C442D25BE5]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[2E78091B3D544417B1142EC96C37C8B7]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -261,6 +501,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[34F17984D258440997C8983264632A56]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:08.411]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:08.411]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1AD40222]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[2D0DA88385FF48B6A2CFB0C15409D10C]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[388E7A22690D4E7E8517D513643F64AB]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -281,6 +545,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[415E7E984AC34C898C6AFA4C2FA2E67F]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.269]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.269]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1AD40222]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[4185252DD0D047F0831E0AD07E89AB26]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[4221F53BC0404B8DB3F888D1A74303CB]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -401,6 +689,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[5DA782ABBEAE474E9C4C35215A7C2089]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.079]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.079]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC23BD023E]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[1DDD2398C7874040B86298967E841075]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[6335EBF14FED4CD39B7D129D6B337A2C]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:15.042]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.042]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[8.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E7D301BADC2F474EAC37A08AD33FFAC3]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[680DC1BAB24B4848960F346B719CA218]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.064]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -421,6 +757,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[6B68B79F5464482DA0F4C7B40F838792]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.867]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.097]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[13.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[33.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[73AD6EF4FF624B92AC48E3EB945268E0]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[6C1869DFE3AB4059AC7F8884B35E2F4D]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.413]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.756]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC211E0237]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2015-05-05 17:32:04.843736]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[EF4215D0C6F44CDBA91B5A310C467D13]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[6C97440049324E50904006CD656D51BD]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -481,6 +865,126 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[6E381EBC62264AA18E6C70291AC61B7E]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.05]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.05]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[3.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[43.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[DFC584FC87754570A22DCCA7B3E8279B]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[6EA4E7055AF44E88A05EFD22BE3D21C9]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:09.949]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.172]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1F580233]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[6D84EC773CCD4738BAA79C11170A50C4]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[7097F2476FD6473EA9A5CE2BA74CCEE5]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.904]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.06]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[7.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[D57063185B1F48EEA956629526A39ACF]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[73E57F6B58A145CAA7D3BD1997EDA4B2]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.083]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.193]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[12.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[45.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[B88CFE2C19B444FAA91294698AC513E3]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[743282EB7CD74F889766315DB25DF38F]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.329]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.329]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1E6E0230]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E88A6CF0DBD54BBF9285ADF96EE35300]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[75F4E68602F541DF9002D9460D86C943]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -521,6 +1025,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[7CB37CA8D4E047B39CABD674C45DD880]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.232]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.232]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1C3C0226]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E5DB7933CA5447F8B5BE15BF9B1FF1E0]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[7FDAC25268844465A53F7385C720B959]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -561,6 +1089,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[80625053A2BD431494605348EFD2ABF8]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.392]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.058]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[40.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E15E9CB7DA82449BAE2E5E19221676C1]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[826C31DAF4BF4D9096F3AE99359D43BE]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -581,6 +1133,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[8575DAAE4B964B058CD4146F724A536F]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.366]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.366]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC21C90239]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[469EAC1B4E8D49D1AA84DDDBC3073E97]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[85BC47DEE487459DAD68396F84C20AEE]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -621,6 +1197,102 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[88A82ADCBA984B4FAD0FD91695EC8121]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:09.789]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.789]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC25340241]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[551144A5E14B47FAB93ECD7E9B732374]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[8F2C498F0BF0448890EA1E005604A2E9]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.227]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.369]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[2.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[16FDE668592B43EDAC3A3841725DB533]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[8FBCCFE8A53D40358B90FE3B0465BAA6]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.501]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.585]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[8.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[30.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[782260EB327C4570977D10EB973CF839]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[95246AED0EFC404DB21EEC091A53493C]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.776]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.405]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[15.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[30.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[FEFF075B4B5C4754A02C6F14FD7987E3]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[9706D7E5F94D42F78F973E70DC5ECB7C]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -641,6 +1313,78 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[973B0AEC1332406B881D5C1ACAED68CC]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.772]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.772]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC20620235]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[A9E6DF5308F84AAE8384E7E3AB08476E]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[984C32CB3AA04AF7859B88A6180D727E]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:09.499]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.38]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC21C90239]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[50B504C7DC33456796966B73D10E8AF7]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[99312665233C4A1C8EFDE5641D48F9A2]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.024]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.024]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2340023D]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[C8F6E1D33411454D97F6C58E801EBD99]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[9997AF7580C14B17A1AE6B43E72DDCC0]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.063]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -661,6 +1405,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[9F309A9A495F45ECBCBA62D061F94DF3]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.749]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.925]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[6.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[CF132667BA514252A60B8D62DE1FA0E8]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[A682D55FD1B04BCB8C23F71384AAF3BE]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.062]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -681,6 +1449,126 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[A74F4D3DDB1C45AD86BF4725F5EE90C8]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.573]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.573]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1B800224]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[469EB1051FEE4C14956B2C44B5692B0A]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[A76FEDBDD8674ACA914B0FA1DA488FC5]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.182]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.928]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[55.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[08066ED86FB944F7812DF07E75B44E91]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[A942B514083944FE91FC870215D30E20]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.491]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.508]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1FD50234]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[CBFDB22F4A7E46838C9089E8BC7BC8F8]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[ABCC63F2F1D04CA8B45165EB0580D50A]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.276]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.508]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[22.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[9B49258A5F134779BCD74963740BC8A4]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[ADE8C8998DCE40479430B9DB9A7817F1]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.076]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.337]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1E6E0230]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[8148FC0D886B45C1ADD13B4D48108F92]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[B0E9089B36C34972A37F45B57C50CAAE]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.062]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -721,6 +1609,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[B4D624185949431F830E8F75D82ACDC3]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.245]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.423]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC211E0237]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[9D04DEC3850C45258A44A6040BEF87AE]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[B60CDFBE0BCD4554B7D3A7F2FDC9C8C2]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.062]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -741,6 +1653,78 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[B66364A1F101402A8C192A7D6F80FA9A]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.898]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.698]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1DC2022E]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[9960]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[9960]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[9E5CC98362C74782A3652F7300CC8E39]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[B96EA60EF2FC42F589532AD4A1EA32F2]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:15.547]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.547]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2015-03-12 15:36:59.388897]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[60.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[2B86CDEDCEA946B5A768FD13DD3A7B14]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[BEC5EB319A074C788275D363B45DE886]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.692]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.784]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[15.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[15.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[BFED2207363B4128952653093F7ACB98]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[C1A8C29E66394C89A36967B695E4ED75]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.062]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -841,6 +1825,78 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[C7160E571DEE48719513FA125EAB75BF]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.707]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.871]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2285023B]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[F3061535D1E8425EAAC2507E883082B3]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[C7645A40B7554049905AD2E561C7D6A3]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.673]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.825]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[7]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[45.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[3637654293CD4F36BAA5644D721E06C9]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[C779CDC3BC024634A1C52F4588D9C81A]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.383]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.383]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1C3C0226]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[BD50EB9026C8418283EA53735310BF99]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[C7B264D48971497F95DAD56A86E29507]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.062]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -941,6 +1997,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[D852810D8E5B4875AC7718224901D26D]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.354]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.492]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[3.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[6DAE46463CD646ABA9C8BAFAED50ACD2]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[D9251D9DCEF647D8A241064C1EC43398]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.812]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.812]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[6.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[51.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[32624DDB9CF84AC9A61467B541C6660C]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[DA7EB2349A66461DB5349335538A12D2]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.061]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -1021,6 +2125,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[E0A0E9732F68410D96BF13216977B42F]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:09.256]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.782]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC20620235]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[4F6220D640FD49C18855B815F9460017]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[E165CBC9BC5A4E19932898935F641BE7]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.061]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -1061,6 +2189,30 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[E35C9AB499624AE8A0DEA70055824ED1]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.113]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.113]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E0D4F0C7C8D2420389B78FEA4BC1BF81]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[E370C9CFDED149CBAE07A8450109861E]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.061]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -1101,6 +2253,78 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[E5B851D832AA4782B1E8643CF99A4E44]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.577]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.693]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[8.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[38.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[BFB7DEEEFF104725A297D9EE04EA2B4A]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[E69E8C2088CB484CBD30EFBE57CA8670]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.947]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.947]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC242B023F]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[C70F43C1E6754CCB9029652C20435422]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[E75D2146F40B4AA7A512F4E692F16376]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:11.861]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.861]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2285023B]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[BD56F083613D4FB98756D3D5AAD42DFF]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[E8C82E5F4B6D44CE82A640CE3AE6602E]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.061]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -1121,6 +2345,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[E99AF40520494F5B8F785BAB2D329252]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:12.499]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.499]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1FD50234]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[10000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[FF24AA159AF046CCB79E02A8A47ECF60]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[E9DE3578C0474EB3886E1D9861B09F5D]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.476]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.599]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:30.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.0000]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[4.0000]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[78D4968583D44F1EB795D6559F8D787E]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[EAC36A9F83F34D239AF6F9DF33450837]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.061]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
@@ -1141,6 +2413,54 @@
 </M_COSTING>
 
 <M_COSTING>
+  <M_COSTING_ID><![CDATA[EDB8DE9FC0854524BE5B64CCC1A7EBD0]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.989]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.128]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2012-07-13 14:08:21.0]]></DATEFROM>
+  <DATETO><![CDATA[2012-07-13 14:08:30.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[9950]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[9950]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[229276B15E35447DB37816DC27ED6FEB]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
+  <M_COSTING_ID><![CDATA[F3E4130A09154FB6860B2233402BB740]]></M_COSTING_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:15.75]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.75]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC211E0237]]></M_PRODUCT_ID>
+  <DATEFROM><![CDATA[2015-05-05 17:32:04.843736]]></DATEFROM>
+  <DATETO><![CDATA[9999-12-31 00:00:00.0]]></DATETO>
+  <ISMANUAL><![CDATA[N]]></ISMANUAL>
+  <QTY><![CDATA[1.00]]></QTY>
+  <PRICE><![CDATA[10.00]]></PRICE>
+  <CUMQTY><![CDATA[10001.00]]></CUMQTY>
+  <COSTTYPE><![CDATA[AVA]]></COSTTYPE>
+  <ISPERMANENT><![CDATA[Y]]></ISPERMANENT>
+  <COST><![CDATA[10.00]]></COST>
+  <ISPRODUCTION><![CDATA[N]]></ISPRODUCTION>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[4E7571663B484A4189700C98C6F93194]]></M_TRANSACTION_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+</M_COSTING>
+
+<M_COSTING>
   <M_COSTING_ID><![CDATA[F80000F2D1E84957A4FD9858AAEAF168]]></M_COSTING_ID>
   <CREATED><![CDATA[2013-07-04 23:38:17.06]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
--- a/referencedata/sampledata/QA_Testing/M_INVENTORY.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/QA_Testing/M_INVENTORY.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -17,7 +17,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -667,7 +667,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -687,7 +687,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[C]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 <M_INVENTORY>
@@ -707,7 +707,7 @@
   <PROCESSING><![CDATA[N]]></PROCESSING>
   <UPDATEQTY><![CDATA[N]]></UPDATEQTY>
   <GENERATELIST><![CDATA[N]]></GENERATELIST>
-  <INVENTORY_TYPE><![CDATA[N]]></INVENTORY_TYPE>
+  <INVENTORY_TYPE><![CDATA[O]]></INVENTORY_TYPE>
 </M_INVENTORY>
 
 </data>
--- a/referencedata/sampledata/QA_Testing/M_TRANSACTION.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/QA_Testing/M_TRANSACTION.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -181,8 +181,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.161]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.161]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.22]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[ABD3492972FA40E9A273FFAE91033F45]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
@@ -191,11 +191,14 @@
   <M_INVENTORYLINE_ID><![CDATA[782E33F55A0540F99D2588C9081895B4]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -440,8 +443,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.16]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.16]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.163]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[1A11102F318D4720957B52C8719A34F2]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -450,11 +453,14 @@
   <M_INVENTORYLINE_ID><![CDATA[3143C3BA23FA40C3BD5DF247411F586F]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[6935919256E94AD0AE4D52309045CB8A]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -467,8 +473,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.16]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.16]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.279]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[FB4D5926A1B443E68CC2DB2BBAE3315D]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -477,11 +483,14 @@
   <M_INVENTORYLINE_ID><![CDATA[09146FD52CAB43B08172193A263E3908]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4B172903365C4D7B88DE3B7363BE2D78]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -552,8 +561,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.16]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.16]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.115]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC23BD023E]]></M_PRODUCT_ID>
@@ -562,11 +571,14 @@
   <M_INVENTORYLINE_ID><![CDATA[5BCBC75FB446475EB94412A2D5F05174]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -608,8 +620,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.16]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.16]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.196]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1F580233]]></M_PRODUCT_ID>
@@ -618,11 +630,14 @@
   <M_INVENTORYLINE_ID><![CDATA[C00F46DC4E534516A75B8CFAD93F4629]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF21402BB]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -664,8 +679,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.16]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.16]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.018]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
@@ -674,11 +689,14 @@
   <M_INVENTORYLINE_ID><![CDATA[5AB9CF96DB514AF7ADE3AC807F1AE4AB]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEB3E027F]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[99500.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -836,7 +854,7 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2015-03-12 15:36:59.0]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-03-12 15:36:59.0]]></UPDATED>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.585]]></UPDATED>
   <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[C-]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[67C3E9C2ADF74AC7A48C0F94CE571AB9]]></M_LOCATOR_ID>
@@ -846,11 +864,14 @@
   <M_INOUTLINE_ID><![CDATA[90E0AA478647430F9E575771E8A13504]]></M_INOUTLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2015-03-12 15:36:59.388897]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -921,8 +942,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.159]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.159]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.092]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1AD40222]]></M_PRODUCT_ID>
@@ -931,11 +952,14 @@
   <M_INVENTORYLINE_ID><![CDATA[D217562103D84622AB3DEC9D73E254E1]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFE4C60272]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -948,8 +972,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.159]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.159]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.636]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[3D91DCA26CA04C588A6F00C9D1F13031]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
@@ -958,11 +982,14 @@
   <M_INVENTORYLINE_ID><![CDATA[2CAF0A3EFC204B2BAB20E58049BCCDA8]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[200.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1004,8 +1031,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.159]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.159]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.858]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[3D91DCA26CA04C588A6F00C9D1F13031]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -1014,11 +1041,14 @@
   <M_INVENTORYLINE_ID><![CDATA[B254EC39FFC34029BC7D474B02CE7769]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[60.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1031,7 +1061,7 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2015-03-12 15:15:18.0]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-03-12 15:15:18.0]]></UPDATED>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.4]]></UPDATED>
   <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[C-]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[3D91DCA26CA04C588A6F00C9D1F13031]]></M_LOCATOR_ID>
@@ -1041,11 +1071,14 @@
   <M_INOUTLINE_ID><![CDATA[261C28BA731846ACB813AE9D3BAD3AB3]]></M_INOUTLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2015-03-12 15:15:18.169591]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1116,8 +1149,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.159]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.159]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.736]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -1126,11 +1159,14 @@
   <M_INVENTORYLINE_ID><![CDATA[A311FCE1737048EB94344E2C3F370D2C]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[BC4F469EE90445AA8D6F41DE8523FA63]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[70.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1201,8 +1237,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.159]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.159]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.312]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1AD40222]]></M_PRODUCT_ID>
@@ -1211,11 +1247,14 @@
   <M_INVENTORYLINE_ID><![CDATA[0D3B295CEF7C4879B1D3F985EB25B863]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEF5502A2]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1344,8 +1383,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.428]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC21C90239]]></M_PRODUCT_ID>
@@ -1354,11 +1393,14 @@
   <M_INVENTORYLINE_ID><![CDATA[10F169F8F6424B51AC8ACADD429CD16F]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1371,8 +1413,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.622]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1B800224]]></M_PRODUCT_ID>
@@ -1381,11 +1423,14 @@
   <M_INVENTORYLINE_ID><![CDATA[7877110F905F4134B526E20F25678009]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEFC202A7]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1398,8 +1443,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.01]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[F750170B8E37497387DA67D70BAF3947]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -1408,11 +1453,14 @@
   <M_INVENTORYLINE_ID><![CDATA[9B2148A5E7B64EC09748663E6E4745C9]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[E2F81DE34D404177BB13E2B4198B83AB]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[120.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1425,7 +1473,7 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2015-05-05 17:32:04.0]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-05-05 17:32:04.0]]></UPDATED>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.89]]></UPDATED>
   <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[V+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
@@ -1435,11 +1483,14 @@
   <M_INOUTLINE_ID><![CDATA[5C5CA732992248A0BAD49F5EBA00DDD0]]></M_INOUTLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2015-05-05 17:32:04.843736]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1452,8 +1503,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.413]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC20620235]]></M_PRODUCT_ID>
@@ -1462,11 +1513,14 @@
   <M_INVENTORYLINE_ID><![CDATA[C8CC21EEE4D74EC3B1E0DA3DEB33C3C3]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFED800293]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1508,8 +1562,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.649]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC21C90239]]></M_PRODUCT_ID>
@@ -1518,11 +1572,14 @@
   <M_INVENTORYLINE_ID><![CDATA[D063140B5767430F8D81F3D22B3EFB1E]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1593,8 +1650,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.158]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.158]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.728]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1DC2022E]]></M_PRODUCT_ID>
@@ -1603,11 +1660,14 @@
   <M_INVENTORYLINE_ID><![CDATA[8415E7B458FC49EFAF2389658360656E]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF12A02B3]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -1649,8 +1709,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.157]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.157]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.867]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC25340241]]></M_PRODUCT_ID>
@@ -1659,11 +1719,14 @@
   <M_INVENTORYLINE_ID><![CDATA[9329A6FA536B4D339107E206A1C8DFB4]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2140,8 +2203,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.157]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.157]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.998]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1F580233]]></M_PRODUCT_ID>
@@ -2150,11 +2213,14 @@
   <M_INVENTORYLINE_ID><![CDATA[54E14C11A74846248C8195F9E4889EB5]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEC96028B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2167,8 +2233,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.157]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.157]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.416]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[1A11102F318D4720957B52C8719A34F2]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -2177,11 +2243,14 @@
   <M_INVENTORYLINE_ID><![CDATA[916814C9EC3C4BEF91B813AFB382E640]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[A414AD61CE3E4068B629AA42BE37AF22]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2484,8 +2553,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.157]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.157]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.919]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[B8D5392245C343208AF013E150ACEB91]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
@@ -2494,11 +2563,14 @@
   <M_INVENTORYLINE_ID><![CDATA[62200584BDA845C58C9E5B17AC41A296]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[BC4F469EE90445AA8D6F41DE8523FA63]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[130.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2569,8 +2641,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.157]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.157]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.532]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[B8D5392245C343208AF013E150ACEB91]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -2579,11 +2651,14 @@
   <M_INVENTORYLINE_ID><![CDATA[AA236A3D12934C8180F976A0D5CEEB5B]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[BC4F469EE90445AA8D6F41DE8523FA63]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[80.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2625,8 +2700,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.536]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[193476BDD14E4A11B651B4E3E8D767C8]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -2635,11 +2710,14 @@
   <M_INVENTORYLINE_ID><![CDATA[D49F3BE2810D46598C4405992F0D7C69]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[C8720D4900B04E60ABD025412F5118B1]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2652,8 +2730,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.644]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[FB4D5926A1B443E68CC2DB2BBAE3315D]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -2662,11 +2740,14 @@
   <M_INVENTORYLINE_ID><![CDATA[7665608B7C894E349A09CDCEF71154D3]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[FA31971390FB4514BECBE9019D0B3749]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2708,8 +2789,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.11]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1E6E0230]]></M_PRODUCT_ID>
@@ -2718,11 +2799,14 @@
   <M_INVENTORYLINE_ID><![CDATA[E086BEDF11734F8287307822588B87BC]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEC190287]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -2822,8 +2906,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.197]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC25D10242]]></M_PRODUCT_ID>
@@ -2832,11 +2916,14 @@
   <M_INVENTORYLINE_ID><![CDATA[5C678748649547DF9EBAEEE157394803]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3110,8 +3197,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.311]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[86A46A53694F439D93D5160B6E24B4B0]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -3120,11 +3207,14 @@
   <M_INVENTORYLINE_ID><![CDATA[15477CADE7E14B6B9830E1F43901C2DC]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[BC4F469EE90445AA8D6F41DE8523FA63]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3166,8 +3256,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.156]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.156]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.964]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[86A46A53694F439D93D5160B6E24B4B0]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
@@ -3176,11 +3266,14 @@
   <M_INVENTORYLINE_ID><![CDATA[FE7D53BDECD143FA814E1057F9DF88DD]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[BC4F469EE90445AA8D6F41DE8523FA63]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[50.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3222,8 +3315,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.155]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.155]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.292]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC211E0237]]></M_PRODUCT_ID>
@@ -3232,11 +3325,14 @@
   <M_INVENTORYLINE_ID><![CDATA[C3DE0CCF28F84085855FA4CAE463BAD0]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3336,8 +3432,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.155]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.155]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.934]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1DC2022E]]></M_PRODUCT_ID>
@@ -3346,11 +3442,14 @@
   <M_INVENTORYLINE_ID><![CDATA[BA189DB07A444A6E8CA5F6C993925571]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEBAC0283]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[99600.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3595,8 +3694,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.155]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.155]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.815]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC20620235]]></M_PRODUCT_ID>
@@ -3605,11 +3704,14 @@
   <M_INVENTORYLINE_ID><![CDATA[9C327AADF3234145819F500525203AFD]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF2EF02C3]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -3999,8 +4101,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.155]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.155]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.137]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[F750170B8E37497387DA67D70BAF3947]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
@@ -4009,11 +4111,14 @@
   <M_INVENTORYLINE_ID><![CDATA[ACAA721BCE554F1CBE4437CDE0DF26BA]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[E2F81DE34D404177BB13E2B4198B83AB]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[120.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4084,8 +4189,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.154]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.154]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.422]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1C3C0226]]></M_PRODUCT_ID>
@@ -4094,11 +4199,14 @@
   <M_INVENTORYLINE_ID><![CDATA[57FAF9CD887D45EC8899AAA0B78F050D]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEAC1027B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4111,8 +4219,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.154]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.154]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.899]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2285023B]]></M_PRODUCT_ID>
@@ -4121,11 +4229,14 @@
   <M_INVENTORYLINE_ID><![CDATA[C0BB77FCDB9B4763A6FB10B404AFA924]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4167,8 +4278,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.154]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.154]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.614]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[ABD3492972FA40E9A273FFAE91033F45]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[3FDFF9456AA74466A9CBBC0FB99F2369]]></M_PRODUCT_ID>
@@ -4177,11 +4288,14 @@
   <M_INVENTORYLINE_ID><![CDATA[AB45844E48DC4EA494C8A000AB818015]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[1B78D7E95FBC47788B4962B11E80002B]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[80.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4194,8 +4308,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.154]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.154]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.722]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[BA240D726F8A4C49AE9FB7B0D828958E]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
@@ -4204,11 +4318,14 @@
   <M_INVENTORYLINE_ID><![CDATA[2AF39E6FAFCB4054AD5639661948A09D]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[150.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4337,8 +4454,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:11.978]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC242B023F]]></M_PRODUCT_ID>
@@ -4347,11 +4464,14 @@
   <M_INVENTORYLINE_ID><![CDATA[8E4114AFE054463EA9CFEAF0B801DA68]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4393,8 +4513,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.058]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2340023D]]></M_PRODUCT_ID>
@@ -4403,11 +4523,14 @@
   <M_INVENTORYLINE_ID><![CDATA[07FC54AAC6204D9FB56E90B6D1155696]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4478,8 +4601,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.542]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1FD50234]]></M_PRODUCT_ID>
@@ -4488,11 +4611,14 @@
   <M_INVENTORYLINE_ID><![CDATA[F511BD9A08844682BA03BF5A547BD52E]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFED13028F]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4592,8 +4718,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.807]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[1A11102F318D4720957B52C8719A34F2]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -4602,11 +4728,14 @@
   <M_INVENTORYLINE_ID><![CDATA[6506E394A99F4EC298B4CF296259F710]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[8757881890954B908D4F403F314CEE36]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4735,8 +4864,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.965]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[193476BDD14E4A11B651B4E3E8D767C8]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -4745,11 +4874,14 @@
   <M_INVENTORYLINE_ID><![CDATA[07E9EE70FAC145D28FA522D4C0AC2600]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[7E311D7934E9497AA5F0F32A379C7DCA]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -4965,8 +5097,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.153]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.153]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.082]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[80413F466DF840C392908B4F36A223DB]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
@@ -4975,11 +5107,14 @@
   <M_INVENTORYLINE_ID><![CDATA[677DF5C0F72741C08E18C276416C9944]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[30.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5021,8 +5156,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.152]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.152]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.154]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
@@ -5031,11 +5166,14 @@
   <M_INVENTORYLINE_ID><![CDATA[CE4C1F64DDE544F79208334055B40DC0]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF0BC02AF]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5048,8 +5186,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.152]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.152]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.446]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[259B5264FA40478ABE3F3DEC4F3203B7]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
@@ -5058,11 +5196,14 @@
   <M_INVENTORYLINE_ID><![CDATA[5264513824F74B6D998432865599EFA3]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5104,8 +5245,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.152]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.152]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.27]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1C3C0226]]></M_PRODUCT_ID>
@@ -5114,11 +5255,14 @@
   <M_INVENTORYLINE_ID><![CDATA[736302507AF445AA980793CC9840DC10]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF03F02AB]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5189,8 +5333,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.152]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.152]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.646]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC24B70240]]></M_PRODUCT_ID>
@@ -5199,11 +5343,14 @@
   <M_INVENTORYLINE_ID><![CDATA[1420A9384137488FB90B36A285D972A1]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5216,8 +5363,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.152]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.152]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.099]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[FB4D5926A1B443E68CC2DB2BBAE3315D]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[901CAFF074954746970719E6A2910638]]></M_PRODUCT_ID>
@@ -5226,11 +5373,14 @@
   <M_INVENTORYLINE_ID><![CDATA[049F726DAA8D4BC6A3E828207B4F5DF4]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[EE27CB9C75A3498595E64A5CD1ADCA9C]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[10.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5243,8 +5393,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.151]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.151]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.36]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1E6E0230]]></M_PRODUCT_ID>
@@ -5253,11 +5403,14 @@
   <M_INVENTORYLINE_ID><![CDATA[E279BD46A06A4D86BAC56BDCB22F52A5]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF19702B7]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5415,8 +5568,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.151]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.151]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.45]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC211E0237]]></M_PRODUCT_ID>
@@ -5425,11 +5578,14 @@
   <M_INVENTORYLINE_ID><![CDATA[69A9EA911D814A6B9066D9C934404F43]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -5558,8 +5714,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.151]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.151]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.751]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC2285023B]]></M_PRODUCT_ID>
@@ -5568,11 +5724,14 @@
   <M_INVENTORYLINE_ID><![CDATA[B5C5EFF61BED4F578B0CEA4A37A935FE]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -6049,8 +6208,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.151]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.151]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.811]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[F9773CCD0D604F2688F542E4AF274A50]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[0CF7C882B8BD4D249F3BCC8727A736D1]]></M_PRODUCT_ID>
@@ -6059,11 +6218,14 @@
   <M_INVENTORYLINE_ID><![CDATA[53CEDBBB03274EC89290B2CD29E97744]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[100]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[150.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -6076,8 +6238,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.151]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.151]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:12.531]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFEF6502A3]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1FD50234]]></M_PRODUCT_ID>
@@ -6086,11 +6248,14 @@
   <M_INVENTORYLINE_ID><![CDATA[2A74693328A44A72B295FD243D931545]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFF28202BF]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:30.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
@@ -6103,8 +6268,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:38:17.15]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:17.15]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.847]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <MOVEMENTTYPE><![CDATA[I+]]></MOVEMENTTYPE>
   <M_LOCATOR_ID><![CDATA[4028E6C72959682B01295ECFE4E50273]]></M_LOCATOR_ID>
   <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1B800224]]></M_PRODUCT_ID>
@@ -6113,11 +6278,14 @@
   <M_INVENTORYLINE_ID><![CDATA[0E5A46685EAE45249958C4EEF3D7DFF1]]></M_INVENTORYLINE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[4028E6C72959682B01295ECFEA540277]]></M_ATTRIBUTESETINSTANCE_ID>
   <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <TRANSACTIONCOST><![CDATA[100000.00]]></TRANSACTIONCOST>
   <TRXPROCESSDATE><![CDATA[2012-07-13 14:08:21.0]]></TRXPROCESSDATE>
-  <ISCOSTCALCULATED><![CDATA[N]]></ISCOSTCALCULATED>
-  <COSTING_STATUS><![CDATA[NC]]></COSTING_STATUS>
-  <CHECKRESERVEDQTY><![CDATA[Y]]></CHECKRESERVEDQTY>
-  <ISPROCESSED><![CDATA[N]]></ISPROCESSED>
+  <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>
--- a/referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml	Mon Dec 21 16:15:13 2015 +0100
+++ b/referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml	Mon Dec 21 16:26:08 2015 +0100
@@ -1,6 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[0083399FA2C348AAA537492E333270B2]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:10.165]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:10.165]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[8BF432FE62B04CD5A4B389E92E6136E3]]></M_TRANSACTION_ID>
+  <COST><![CDATA[100000.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:21.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.423]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[05278DF0EAA647D480BE0E29261C86B2]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -35,6 +52,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[062EDB62EF28402D8B5B9082AF3F6F07]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:14.052]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:14.052]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[DFC584FC87754570A22DCCA7B3E8279B]]></M_TRANSACTION_ID>
+  <COST><![CDATA[30.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:30.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.655]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[096E2785BBEC47E3A868555EBD82AA88]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -205,6 +239,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[1882F4F261364155B875058FA996CE3F]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.923]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.923]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[9CA0C8838CAB47F6AE8D4E8EC56438E0]]></M_TRANSACTION_ID>
+  <COST><![CDATA[50.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:30.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.655]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[1A7A3F4D196B47BF939DB7526C59730C]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
@@ -307,6 +358,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[20A1E2C528494B40BE49F77831A76842]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:15.044]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:15.044]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[E7D301BADC2F474EAC37A08AD33FFAC3]]></M_TRANSACTION_ID>
+  <COST><![CDATA[10.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:30.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.655]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[22E9861561274B9CBD21200AF38B2A8C]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
@@ -392,6 +460,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[25AB11231F8046068AC14550BDD33E0B]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:13.185]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:13.185]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[08066ED86FB944F7812DF07E75B44E91]]></M_TRANSACTION_ID>
+  <COST><![CDATA[100.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:30.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.655]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[27D7ACF0DBF14F5C9B6E3B2D4B94C638]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -409,6 +494,23 @@
 </M_TRANSACTION_COST>
 
 <M_TRANSACTION_COST>
+  <M_TRANSACTION_COST_ID><![CDATA[27F0C796B1574E7F9C0271566352EA3A]]></M_TRANSACTION_COST_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
+  <CREATED><![CDATA[2015-10-26 15:12:09.964]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-10-26 15:12:09.964]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <M_TRANSACTION_ID><![CDATA[6D84EC773CCD4738BAA79C11170A50C4]]></M_TRANSACTION_ID>
+  <COST><![CDATA[100000.00]]></COST>
+  <COSTDATE><![CDATA[2012-07-13 14:08:21.0]]></COSTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <ISUNITCOST><![CDATA[Y]]></ISUNITCOST>
+  <DATEACCT><![CDATA[2012-07-13 14:06:30.423]]></DATEACCT>
+</M_TRANSACTION_COST>
+
+<M_TRANSACTION_COST>
   <M_TRANSACTION_COST_ID><![CDATA[284C9A45E0A04E0CA30E3F16A192E46E]]></M_TRANSACTION_COST_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>