Merge temporary head for 3.0MPXX
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 10 Jul 2013 12:15:48 +0000
changeset 20685 dda53450ca1d
parent 20679 62f36c5324f7 (current diff)
parent 20684 5ba976476b53 (diff)
child 20686 03d3a5bd427f
child 20729 389e36c3cc5e
Merge temporary head for 3.0MPXX
.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/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
src/org/openbravo/materialmgmt/InventoryCountProcess.java
--- a/.hgsigs	Tue Jul 02 01:53:14 2013 +0200
+++ b/.hgsigs	Wed Jul 10 12:15:48 2013 +0000
@@ -113,5 +113,6 @@
 d6967f5f10c642017a6e2be5206cb4d44926cdc5 0 iEYEABECAAYFAlGbmiwACgkQCX/oGf+2qkMWbACgpTdvV7HBnS+rgaGKicLXOxWY3oMAniRBr+lgXOABzgOP4QsT6Yhww83h
 7c487ba0b222d5d9540b24223a71e62efaab1449 0 iEYEABECAAYFAlGaRDIACgkQCX/oGf+2qkMc2wCdFY+72j0R/gz/WVnIwnnPxJH1ljQAoJqjDgZUoszxKo/Gk567MXvsppVN
 673a31036fb2354aecc062b8a8fe3399b0c39192 0 iEYEABECAAYFAlHINdcACgkQCX/oGf+2qkMLNACdGjH1WVLG8nG6btOUq9pIgcwKnCUAoNZS4rpHIx7ARjx87ha6wYyWJYEE
+859de1db934381df3b1eb0e863ec19a887565331 0 iEYEABECAAYFAlHbj5AACgkQCX/oGf+2qkMgJACgz7U/fVr1o5M08eTFaJQDldJ5xBoAoI6O81kGY5mmurordwIpiYKlT7wp
 b0634b11086a05db9d54275a05c64f23bf12f805 0 iEYEABECAAYFAlHBMSwACgkQCX/oGf+2qkOR+ACcDWGNCcZXny0x54Jkrc744UEpy3kAn3L1sDVMcfqraHG8ierwEcnOL9S3
 5efe3c4189c7db9b2ea2bdff73de3256217df045 0 iEYEABECAAYFAlHNMRQACgkQCX/oGf+2qkPkMACfSJJJM2kdf89Up4kfEbCZW/smRIEAoKbC5gBEuEKdflRQU5ber6TXErjQ
--- a/.hgtags	Tue Jul 02 01:53:14 2013 +0200
+++ b/.hgtags	Wed Jul 10 12:15:48 2013 +0000
@@ -124,5 +124,6 @@
 32eb242529bb23a5397ef58aab85d9e42965f08e 3.0MP22.3
 93ebf694603919f347a7bdbb5388045094da2492 3.0MP23
 e33bac4c2962faa7a58189eba71594b4ede58a8b 3.0MP23.1
+af209003923492e8a18062c4dc58711d445345ed 3.0MP23.2
 692d465ddec51a2cf0798735abe7fa33436ac1ec 3.0MP24
 fdd2929b3158b981bad058be133c560874629a1c 3.0MP24.1