Merge temporary head for 3.0PR15Q2.4
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 26 Aug 2015 11:15:36 +0000
changeset 27618 50a2e5782980
parent 27605 e847ea2dfcc5 (current diff)
parent 27617 6a962f88427f (diff)
child 27619 edf1adeb57d5
Merge temporary head for 3.0PR15Q2.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.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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/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_COLUMN.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TABLE.xml
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java
src/org/openbravo/erpCommon/security/Login.html
src/org/openbravo/erpCommon/security/Login_F1.html
web/js/utils.js
--- a/.hgsigs	Tue Aug 25 13:31:06 2015 +0000
+++ b/.hgsigs	Wed Aug 26 11:15:36 2015 +0000
@@ -174,4 +174,5 @@
 fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty
 bd0e758ae44eb624d8af403fb4764629c1a45b21 0 iEYEABECAAYFAlWChbsACgkQCX/oGf+2qkM6xACfXP4M7zXaih+uqkIpGHMqGPTzxD8An0r58zI1YN3gKOT9t0kZ3IdaNA7c
 906c7a47100c5694d720f6a00a8d205538562334 0 iEYEABECAAYFAlW3GiEACgkQCX/oGf+2qkNk4gCfVlZA1GqR2LvJwBPBXoMn6RCRyFYAnA4aPF+fOZXRpAqKMRT55nvswuRI
+6dfd2fade034c7225367366dc34dcf402b596555 0 iEYEABECAAYFAlXccLwACgkQCX/oGf+2qkPEMQCeM4MxdgXlCtbu0xqZNcX0IAEuGZgAnAjQlB4gOw0q84Q/gFyRL38jkahJ
 73f7d3c67dc7d6063af1dac6e71db12b9081150a 0 iEYEABECAAYFAlXMHl0ACgkQCX/oGf+2qkNVuACfTfB6/RfeioYrYtsi81kAwADW0lgAoOJdXKScLwl6RHeXIFvMlrzlcT6w
--- a/.hgtags	Tue Aug 25 13:31:06 2015 +0000
+++ b/.hgtags	Wed Aug 26 11:15:36 2015 +0000
@@ -185,4 +185,5 @@
 e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1
 a28a880b5aeb9208eaf0ce569fd51b7a5fc2b48e 3.0PR15Q2.2
 01405101d810eaafec106bab50ce31b41df52569 3.0PR15Q2.3
+d26c43a861dec9147a6a60d8aca52359837e9591 3.0PR15Q2.4
 828faf1939944cd8d55d562494138f68305c5b50 3.0PR15Q3