Merge temporary head for 3.0MP31.4
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 11 Jun 2014 09:36:28 +0000
changeset 23471 ad690daca17f
parent 23459 763f16c2ad2e (current diff)
parent 23470 625b5d2fd2fa (diff)
child 23472 2b8030095ea6
Merge temporary head for 3.0MP31.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.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/src/org/openbravo/client/application/window/OBViewGridComponent.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.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_MODULE.xml
--- a/.hgsigs	Tue Jun 10 19:50:47 2014 +0000
+++ b/.hgsigs	Wed Jun 11 09:36:28 2014 +0000
@@ -146,5 +146,6 @@
 43f6f77b25a9c7d51084945606d9047edc330fd9 0 iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl
 798fae4fdaf127b043499f76df3decadaf36ba62 0 iEYEABECAAYFAlMOzmsACgkQCX/oGf+2qkOFaACeNhkWHX9QfZ2zhxYiyjgbjenzvnkAoIb5zBld70lqFa7N0rOsf32Rb0Lo
 54ac6316c5c34c5eb2c4dfa95a504b3ecd5a33cb 0 iEYEABECAAYFAlNw/70ACgkQCX/oGf+2qkMO1wCfbXNv+SWd0NrkIw75mUSyu31zi6cAnRgI/Rj3MoUIu7VDDBhLbZnq21OR
+edac701bed6828715cff776651dac79d309674ca 0 iEYEABECAAYFAlOWq2kACgkQCX/oGf+2qkOzsQCfQUbf6PPjT2hXJz31XB7Wnn6vXUUAn0BB3aVsVa2uqv+VxNdO1GlAd+MN
 82edc3e63e3d23403efb378924c8e8f991c73cfc 0 iEYEABECAAYFAlNjfr0ACgkQCX/oGf+2qkPLVwCgowJ6SZ7/i3HJzN7KzIEqRxY60+MAoJbXOSIqx3xHRoG/yeZSdSST8zIV
 7de34ade782eae3f74b2df2471292e0da145eb47 0 iEYEABECAAYFAlN95g4ACgkQCX/oGf+2qkO62ACg74llt2Ngb7UyteX/drSuZ6/U8mIAn2I3sFYMtTZ3jzjR5zGOJ3M8/Ah0
--- a/.hgtags	Tue Jun 10 19:50:47 2014 +0000
+++ b/.hgtags	Wed Jun 11 09:36:28 2014 +0000
@@ -157,5 +157,6 @@
 510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1
 3044ba5dda0c5f188fbea125287005ef4b06ee76 3.0MP31.2
 70267e407fec28ae0268e89686dfe6e551614d16 3.0MP31.3
+8f75794bc0d9e07225605892bb036f89f82070b0 3.0MP31.4
 2dac23c5332cf7fab337385841dcd65e9eaf78c0 3.0PR14Q2
 6b79b2cff11381014860b41d7db9c3835c87069b 3.0PR14Q2.1