Merge temporary head for 3.0PR18Q1.1
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 26 Mar 2018 13:56:25 +0000
changeset 33767 4c9a0dbe7484
parent 33750 7cb2e8e06823 (current diff)
parent 33766 b7833836d511 (diff)
child 33768 14c8876031c4
Merge temporary head for 3.0PR18Q1.1
.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.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.apachejdbcconnectionpool/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.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_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-trl/src/org/openbravo/translate/Translate.java
src-wad/src/org/openbravo/wad/Wad.java
src-wad/src/org/openbravo/wad/Wad_data.xsql
src-wad/src/org/openbravo/wad/web.xml
src-wad/src/org/openbravo/wad/webConf.xml
src/org/openbravo/erpCommon/security/Login.html
web/js/utils.js
--- a/.hgsigs	Mon Mar 26 12:45:53 2018 +0000
+++ b/.hgsigs	Mon Mar 26 13:56:25 2018 +0000
@@ -227,3 +227,4 @@
 2ed90e80323f7bf5245be3946e2f60ea68d30f6e 0 iEYEABECAAYFAlqFgUsACgkQCX/oGf+2qkMGWwCg9AesP/a8fHuHrGVkUZcGk0x8CSgAniD73vR4fZ3uaU1eqtQr9HYlwpCQ
 f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT
 b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC
+c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb
--- a/.hgtags	Mon Mar 26 12:45:53 2018 +0000
+++ b/.hgtags	Mon Mar 26 13:56:25 2018 +0000
@@ -238,3 +238,4 @@
 82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1
 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2
 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1
+03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1