Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 10 Oct 2013 14:30:03 +0200
changeset 21281 aa0a3079ce66
parent 21280 f3b3ef52284b (current diff)
parent 21243 e636887f6f83 (diff)
child 21282 2b5c09bed087
Merge back from main
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql
src/org/openbravo/event/MInOutLineEventHandler.java
--- a/.hgsigs	Thu Oct 10 10:59:20 2013 +0200
+++ b/.hgsigs	Thu Oct 10 14:30:03 2013 +0200
@@ -123,4 +123,5 @@
 25c6c6b0acf9bc7dc91e39a5c7171d391354366f 0 iEYEABECAAYFAlIJt2EACgkQCX/oGf+2qkNshACg9Vi913GItU4PNXC2H0MqGKJnMQsAniAnZcbGlfjD0YbFourNSNs9rfl+
 03423edd830d99ac30c5938c915bd59b5805f39c 0 iEYEABECAAYFAlIXIXMACgkQCX/oGf+2qkOBnQCfVTDJFemSCCNyONytrElhgPzT7SEAnimrHqNU+GRUeeMHaY+/cVoYAwRD
 2cba8a4800b004a03d6bdc1863084421a17a496e 0 iEYEABECAAYFAlIoL7sACgkQCX/oGf+2qkPyTQCfVLRC/dJweMhAtUQUf0ysLeJuU1YAoMjPgLwhtEHs7DYZKMGkgrRKxfUP
+92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe
 b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx
--- a/.hgtags	Thu Oct 10 10:59:20 2013 +0200
+++ b/.hgtags	Thu Oct 10 14:30:03 2013 +0200
@@ -134,4 +134,5 @@
 3ca2970a589227c6dfc3fbefe2650385ea7ddebc 3.0MP26
 28fa441122298d5cd7cabe28490ec7d6435e7809 3.0MP26.1
 1e51c66c0c395e41fc5384608dcd539a255c210d 3.0MP26.2
+f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3
 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27