Mercurial Mercurial > erp > devel > main / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Merge temporary head for 3.0MP5.2
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 07 Dec 2011 10:53:55 +0000
changeset 14810 014599a9d040
parent 14791 bdc6462da2f2 (current diff)
parent 14809 4ef0c3a7c7bf (diff)
child 14819 8d4cd33eb7ca
Merge temporary head for 3.0MP5.2
.hgsigs file | annotate | diff | comparison | revisions
.hgtags file | annotate | diff | comparison | revisions
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js file | annotate | diff | comparison | revisions
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js file | annotate | diff | comparison | revisions
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_MODULE.xml file | annotate | diff | comparison | revisions 
--- a/.hgsigs	Fri Dec 02 08:03:01 2011 +0100
+++ b/.hgsigs	Wed Dec 07 10:53:55 2011 +0000
@@ -49,3 +49,4 @@
 d6c9101ee9cc4436d57c65ad0520ec8b24917ef0 0 iEYEABECAAYFAk7ClYYACgkQCX/oGf+2qkMNfgCeN69iKR3vkIoXrebAjrJVMGsmlIoAmwRui8P5+KqWtxgz2idZtgDNROdL
 e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
 9bb62accddbd9114aa4562816ab5b0234b01b1fa 0 iEYEABECAAYFAk7Gf8IACgkQCX/oGf+2qkMwUACfbNSWszDOxciN14aA09Oe8da52TIAn3xc3Kgek0jmetz0q+lzPVxdAjjk
+1421ed09d86c5034375386393db18b2dc8866f77 0 iEYEABECAAYFAk7c/wQACgkQCX/oGf+2qkPZnwCfdfdLV/fHXKEXL0S+g9ip2PZuc5gAoL89Tv+s7FGS6g9HCfZSAkm76AF3
--- a/.hgtags	Fri Dec 02 08:03:01 2011 +0100
+++ b/.hgtags	Wed Dec 07 10:53:55 2011 +0000
@@ -60,3 +60,4 @@
 4b9a007b2e863b7c914d50ca7abcabf4912c784b 3.0MP4.2
 bee1528a5966a4681a86ed0c9f7129f8f8818ab1 3.0MP5
 5752cade8b792f72e160c7b5870f03b3e5f8bd40 3.0MP5.1
+dae8c968fb85db1920332150543459a147e5fde3 3.0MP5.2
devel/main