Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 17 Dec 2012 04:46:29 +0100
changeset 19052 1114c576c613
parent 19039 4bcece1871c7 (current diff)
parent 19051 469559462d33 (diff)
child 19053 5f18d9cbb502
child 19055 c79ef1b1f830
Merge back from main
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/form/formitem/ob-formitem-minidaterange.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/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.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_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
--- a/.hgsigs	Fri Dec 14 14:11:12 2012 +0100
+++ b/.hgsigs	Mon Dec 17 04:46:29 2012 +0100
@@ -91,3 +91,4 @@
 dcee1af5f243600cbed68798e892b7ba73a06ffa 0 iEYEABECAAYFAlC081kACgkQCX/oGf+2qkMU0ACfVvvLz1k+IF5axkQ2PQbFbJdLAVgAoN8XtUH6J76jpKSCx3GriplFPxdl
 d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag
 3ded67251154d0aa958eacb918de97fd5a77e3dc 0 iEYEABECAAYFAlC3tuIACgkQCX/oGf+2qkO0zgCdFACe5suzHq8pukNoc8ghZJlvO6UAn3wzW4/wmIEfmngxthdtqRTrSQ2X
+9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3
--- a/.hgtags	Fri Dec 14 14:11:12 2012 +0100
+++ b/.hgtags	Mon Dec 17 04:46:29 2012 +0100
@@ -102,3 +102,4 @@
 c8ad7ddf47ddda7a33b56bafceff8d1ae5dadef2 3.0MP16.3
 f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17
 41ad849c6978ec887187853448c1f1a79fc01c4f 3.0MP17.1
+43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18