Merge temporary head for 3.0MP2.3
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 26 Sep 2011 15:23:44 +0000
changeset 13692 53b25752950c
parent 13683 5aa80e898e21 (current diff)
parent 13691 16f4007136e7 (diff)
child 13693 415240d522f2
Merge temporary head for 3.0MP2.3
.hgignore
.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.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/model/triggers/FIN_FINACC_TRANSACTION_TRG.xml
src-db/database/model/triggers/FIN_PAYMENT_TRG.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java
src/org/openbravo/erpCommon/ad_forms/DocLine_FINReconciliation.java
src/org/openbravo/erpCommon/ad_forms/Fact.java
src/org/openbravo/erpCommon/ad_forms/FactLine.java
--- a/.hgsigs	Mon Sep 12 08:52:38 2011 +0200
+++ b/.hgsigs	Mon Sep 26 15:23:44 2011 +0000
@@ -39,3 +39,4 @@
 298c364b00dfafd8d14f39e4c46582666b63b792 0 iEYEABECAAYFAk5FBE8ACgkQCX/oGf+2qkMLLwCg5owJffX+FRvdAhcx5lu98a+bczMAoOrxERXMnWJcjrPiRsHe9uK2rbEB
 73cf94540eee261735546af235c022b6629c60b4 0 iEYEABECAAYFAk5km6QACgkQCX/oGf+2qkMg+QCfSxJaCXo3RB98Em77DE2wTgMdIrsAn3lvr6yVFui+ZIn81ELLNg6+hjTY
 de6ba33247c6a6fe40c8091880ca88371e62f9e5 0 iEYEABECAAYFAk5uEmIACgkQCX/oGf+2qkMqYwCeOiBUc3Bbsscvh17YA3xEium84OsAoNuBTpQKw5uNm0oE7YgIYfxislr9
+1337fbe9577f700323ed7dca2830832d4c767c24 0 iEYEABECAAYFAk58b5AACgkQCX/oGf+2qkOhuwCfcZb9pTthMp2BXE6xcKVquD27R7MAnidzwSvbx4rJK2XvWht0B35hELV4
--- a/.hgtags	Mon Sep 12 08:52:38 2011 +0200
+++ b/.hgtags	Mon Sep 26 15:23:44 2011 +0000
@@ -50,3 +50,4 @@
 e303b38f24e9a12a4b8fdf0b2408055a2ab040d7 3.0MP2
 7ab6e81dcecb181d85885103d32f2f6ccac8b0a1 3.0MP2.1
 d08117cade69fcc9ac91619661a6b5071db6af16 3.0MP2.2
+74d95de540d0f428ab9c53303fa45ac6c192885c 3.0MP2.3