Merge temporary head for 3.0PR18Q4.2
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 01 Mar 2019 05:54:16 +0000
changeset 35542 2d10c9fb9cd4
parent 35527 a63fa32a907a (current diff)
parent 35541 b3a9fff4ea34 (diff)
child 35543 add8fb4f0291
child 35631 a1f02ffebeaa
Merge temporary head for 3.0PR18Q4.2
.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.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java
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.myob/src/org/openbravo/client/myob/WidgetProvider.java
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/model/tables/C_INVOICE.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MODULE.xml
src/index.jsp
src/org/openbravo/erpCommon/security/Login.html
src/org/openbravo/financial/ResetAccounting.java
web/js/utils.js
--- a/.hgsigs	Tue Feb 26 06:23:58 2019 +0000
+++ b/.hgsigs	Fri Mar 01 05:54:16 2019 +0000
@@ -242,3 +242,4 @@
 8b5dcae632a712dcd008a7b443275feabb96124d 0 iEYEABECAAYFAlxzd1cACgkQCX/oGf+2qkP4QwCbBrJsc3EKBLwCor/dKKpvZTeei6IAni7w8nCPCBT2wVoJpQct5hy4mBVZ
 75b4bc3d1f6f172a24506f5f72ce3137fa23aa7b 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXA380QAKCRAJf+gZ/7aqQz70AKCz/O6ZFoJ9ewfn1JayCUThy5+mrQCeMkwewiAYcsfmFxp16XA497wv158=
 e608a90d459c54db28903268ce5930e230af8e6f 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXCMjxQAKCRAJf+gZ/7aqQzC/AJ9XbUfKrdRJWO2jbnBYCFGSeUQsDwCgiOfjBtc3k+hWxB6NWUPukzcduoo=
+c508fdfd08e0165b19ce0b036057fb477ec53b2d 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXHaDaQAKCRAJf+gZ/7aqQ+WQAKC9aZKEZiAzmHtHS2DU/BebakLrDwCgmPGmEdALKCn+hWjKUkLY6Yc5FbI=
--- a/.hgtags	Tue Feb 26 06:23:58 2019 +0000
+++ b/.hgtags	Fri Mar 01 05:54:16 2019 +0000
@@ -253,3 +253,4 @@
 a68402a5ca6f812dcf5a6b0b7505cbafc64384b6 3.0PR18Q3.5
 9a7acd649cfcb6ea234c52263051d7e33e4ce333 3.0PR18Q4
 a67abc7a3690347038295600eeb97f92460cc742 3.0PR18Q4.1
+c23ab3fedd95c122ea2e49cb4a9d6744f75dd975 3.0PR18Q4.2