Merge temporary head for 3.0MP10.2
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 14 May 2012 05:38:23 +0000
changeset 16278 7a9fe4909d68
parent 16265 55a3d2f610aa (current diff)
parent 16277 4a2201d22059 (diff)
child 16279 73971a64d21c
child 16537 afdd6b12058b
Merge temporary head for 3.0MP10.2
.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/functions/MRP_RUN_INITIALIZE.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_process/AlertProcess.java
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
--- a/.hgsigs	Wed May 09 12:13:08 2012 +0000
+++ b/.hgsigs	Mon May 14 05:38:23 2012 +0000
@@ -68,3 +68,4 @@
 7a9d4ff35b0f5a978d2dc47d387e974898340d9d 0 iEYEABECAAYFAk+Rm1EACgkQCX/oGf+2qkOHAQCdEPh9Z+3tNo6OybQXTGloAJkhDgAAn32RTPHXoVCSCHO/0hOTOazH/yRo
 ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC
 17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y
+80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE
--- a/.hgtags	Wed May 09 12:13:08 2012 +0000
+++ b/.hgtags	Mon May 14 05:38:23 2012 +0000
@@ -79,3 +79,4 @@
 5f9198ef9b16258149c3de30d5811e9c9d50cbf6 3.0MP9.2
 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10
 4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1
+35a1ec14c74d970e083b2d195ea2eed784d5ac1c 3.0MP10.2