Merge temporary head for 3.0MP2.4
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 18 Oct 2011 10:56:27 +0000
changeset 13975 e28d7b85f1dd
parent 13969 645c3587edf3 (current diff)
parent 13974 0d9cfe70e673 (diff)
child 14007 3a0e09f510aa
Merge temporary head for 3.0MP2.4
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Oct 14 13:52:17 2011 +0000
+++ b/.hgsigs	Tue Oct 18 10:56:27 2011 +0000
@@ -40,5 +40,6 @@
 73cf94540eee261735546af235c022b6629c60b4 0 iEYEABECAAYFAk5km6QACgkQCX/oGf+2qkMg+QCfSxJaCXo3RB98Em77DE2wTgMdIrsAn3lvr6yVFui+ZIn81ELLNg6+hjTY
 de6ba33247c6a6fe40c8091880ca88371e62f9e5 0 iEYEABECAAYFAk5uEmIACgkQCX/oGf+2qkMqYwCeOiBUc3Bbsscvh17YA3xEium84OsAoNuBTpQKw5uNm0oE7YgIYfxislr9
 1337fbe9577f700323ed7dca2830832d4c767c24 0 iEYEABECAAYFAk58b5AACgkQCX/oGf+2qkOhuwCfcZb9pTthMp2BXE6xcKVquD27R7MAnidzwSvbx4rJK2XvWht0B35hELV4
+819660861fcf70114fd97793de78cec4cc3ef63b 0 iEYEABECAAYFAk6ZYrAACgkQCX/oGf+2qkODfgCeNU807u8Lz0PaEwb/4hkZzwHn8l8AoLwXed7lxTH/jybwSSOGvGMde+M/
 36fbd0e92534c9261754d500e9ef0d1a45744b59 0 iEYEABECAAYFAk6B2kgACgkQCX/oGf+2qkPXrwCghp9G3HStth7Hc4vevflmiJsaL/sAoLKnTFUyu4ZX8mlLusps5zAiWNjT
 19fb1243d437ff7490e6ad44018c4e403cf18af4 0 iEYEABECAAYFAk6YPpEACgkQCX/oGf+2qkO6NwCeJdcbggzlqxYL7K1NG98pjnWjH60AoL/aHl5Qi1e2UvFGbAeFcJZmR2AH
--- a/.hgtags	Fri Oct 14 13:52:17 2011 +0000
+++ b/.hgtags	Tue Oct 18 10:56:27 2011 +0000
@@ -51,5 +51,6 @@
 7ab6e81dcecb181d85885103d32f2f6ccac8b0a1 3.0MP2.1
 d08117cade69fcc9ac91619661a6b5071db6af16 3.0MP2.2
 74d95de540d0f428ab9c53303fa45ac6c192885c 3.0MP2.3
+e67ea53b0101e8a09ede8823ebf90cfb6f01a60c 3.0MP2.4
 c7a189353e46e28e320809a2e8aaaaac8c6f67e2 3.0MP3
 4e9fa8e7edbc01b25ebaa4aefb7b9cff61a91f98 3.0MP4