Merge temporary head for 3.0PR14Q2.6
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 01 Oct 2014 12:40:23 +0000
changeset 24732 5f73630e44a6
parent 24722 2cae02185081 (current diff)
parent 24731 74907c0f5ebd (diff)
child 24743 f88a82578c9c
Merge temporary head for 3.0PR14Q2.6
.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/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.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.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
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 Sep 30 20:04:20 2014 +0000
+++ b/.hgsigs	Wed Oct 01 12:40:23 2014 +0000
@@ -153,5 +153,6 @@
 79d26cfa1fe16e6ba26251919588218073d8682f 0 iEYEABECAAYFAlOrwz0ACgkQCX/oGf+2qkOPlQCfV15XdSozD91qAF751lOUOH3VwroAn08TYpciEyWBOxsFXend1IUEPsnA
 9607751357e9e3a411c0919759ed81196befcad9 0 iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh
 11ed6ecc0a194545a1f8a3af2b2674b0ec319f99 0 iEYEABECAAYFAlPblXoACgkQCX/oGf+2qkOuxACfX5e+wRgLJw88VUyHl32C+QC8PY8AoOoARsJUAOnu8IgYYwNjyw5xMlKC
+794c7a6eb44d57c6a7d862b767ce468f0b7c8eb3 0 iEYEABECAAYFAlQrnFIACgkQCX/oGf+2qkOoBwCg3XsJxaAFlVvuIbHJtqpfAgRzVacAoMO5XmGzPQqzn15w7Ub+vUDOsQs8
 a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA=
 c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
--- a/.hgtags	Tue Sep 30 20:04:20 2014 +0000
+++ b/.hgtags	Wed Oct 01 12:40:23 2014 +0000
@@ -164,5 +164,6 @@
 623357e87f6cc274e2b75b2eda60d11dd0c593d2 3.0PR14Q2.3
 73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4
 abfe5a20ef579b8edaf9866346ee876a00e87eee 3.0PR14Q2.5
+ae2b41d1cc2ee45fe4fbc5bc6e7879d10418ad3f 3.0PR14Q2.6
 d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3
 a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1