Merge from main, import tags
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Wed, 27 Apr 2011 16:11:59 +0200
changeset 11734 d74c722d6154
parent 11733 2c4261aece14 (current diff)
parent 11599 738b443632a7 (diff)
child 11735 33fa8bd2fa96
Merge from main, import tags
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.application/web/org.openbravo.client.application/js/ob-view-grid.js
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.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	Wed Apr 27 15:28:55 2011 +0200
+++ b/.hgsigs	Wed Apr 27 16:11:59 2011 +0200
@@ -32,3 +32,4 @@
 6b5829bdfb83a717983a5cc3d93cf23993504dee 0 iEYEABECAAYFAk2D2aIACgkQCX/oGf+2qkNw4ACgnusvXTfY7cwcF8JIyx3gMPDE18sAmQG/UCHIcT/mmqX1UcgpiCgEqUB3
 290cb79e7e1b40a7584920fa1ab2319bb6f36dd2 0 iEYEABECAAYFAk2TX/0ACgkQCX/oGf+2qkPETwCdF5Lxy/MMap+EFbYn3VPcBWjg6qUAoLYKMP5vkaxVXxQWqMrAEKJ+Tr3a
 6476aa1e07119478af0225400d92664a698c4d92 0 iEYEABECAAYFAk2tOmkACgkQCX/oGf+2qkOdjQCfbLZLz0XBihiG+saQfXDmrFB6Tl8AoNsbxxXriyOl3cEOgzir5OwVzMYe
+d966facd4b0f349024c65098e97d877604b633f8 0 iEYEABECAAYFAk2yfgAACgkQCX/oGf+2qkPg7QCg+KcrtTvoOhqRFuZSyamnjNgoMGcAnA/zSMJDkZXRxAYxQmcrz7xdQvcB
--- a/.hgtags	Wed Apr 27 15:28:55 2011 +0200
+++ b/.hgtags	Wed Apr 27 16:11:59 2011 +0200
@@ -42,3 +42,4 @@
 2900108d13e7c88366e2993a7e4ccae9a9a13618 3.0RC5
 5f47e83fbcb3746a754737199769a7edd6a9eee2 3.0RC5.1
 9fbc1df28282a4a8fb30755c67f6b1fde74dc167 3.0RC6
+31c9f7abb644b441de8b69a4493f6953621e1017 3.0RC6.1