Merge back from main
authorPriya Muthukumar <priya.muthukumar@openbravo.com>
Tue, 11 Sep 2012 07:45:39 +0200
changeset 17917 b1b544c29c1a
parent 17894 44b875f62465 (current diff)
parent 17916 2119e2bbc7a4 (diff)
child 17918 b24f2a9e399e
Merge back from main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
src-db/database/model/functions/C_INVOICE_POST.xml
src-db/database/model/functions/M_INOUT_POST.xml
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_MODULE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java
--- a/.hgsigs	Mon Sep 10 13:46:20 2012 +0200
+++ b/.hgsigs	Tue Sep 11 07:45:39 2012 +0200
@@ -77,4 +77,5 @@
 747753a54e2eecdc25f659780f62b70802b11735 0 iEYEABECAAYFAk/2WecACgkQCX/oGf+2qkOzUACcDDn8V+yk9lsiWNjYaKmHT27rmSgAoLrxg9SWAmwu7DBYqGfrqrB9Eanr
 e73588ed4b71972072141cda206f2382c618fbc8 0 iEYEABECAAYFAlAlOJcACgkQCX/oGf+2qkN2uwCg1Nd3SJnzR1OdCXmMDHxOm/C8kEsAoMF+P+CltaPNylrKX7B4wimfTW/e
 a934dbe3f5fad31293f1a5a2cc6f2ca630fd0f31 0 iEYEABECAAYFAlAGLkgACgkQCX/oGf+2qkOu/ACfYJXb8JwO69uZVxLM2u6BHOwQHj4AoJ08uNluEH3iB94pfMnCsD2URUX8
+110a8fe1328f4a9e7e5ff1179ace3e529286cfce 0 iEYEABECAAYFAlBN5pQACgkQCX/oGf+2qkN9ZACZAZXSsoFWJoDLsoqPj9aGd6QiEjoAoP79Il22Awt4fupQo3hqZL+JOYd9
 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz
--- a/.hgtags	Mon Sep 10 13:46:20 2012 +0200
+++ b/.hgtags	Tue Sep 11 07:45:39 2012 +0200
@@ -88,4 +88,5 @@
 1b0f90676e38f67c46ea0f27b9c28beca1cbf79d 3.0MP12.1
 6319e314cf98d9fd0df44324e8a5b2aead800b54 3.0MP12.2
 33314611486b1823d42d1059110369d7705ef13f 3.0MP13
+0389ecbdda642f959d524d644f1a73a3bc27d57a 3.0MP13.1
 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14