Merge temporary head for 3.0PR19Q2.1
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 22 Jul 2019 05:12:26 +0000
changeset 36264 d318e75732c2
parent 36236 d457199b20ea (current diff)
parent 36263 9fcb477002e7 (diff)
child 36270 9bce7237e939
Merge temporary head for 3.0PR19Q2.1
.eslintignore
.eslintrc.json
.hgsigs
.hgtags
.prettierrc.json
legal/Licensing.txt
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/dao/AdvPaymentMngtDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
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.application/src-test/org/openbravo/client/application/test/ADCSTest.java
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-attachment-view.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-standard-view-window.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/properties.js.ftl
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/upload/ob-upload-popup.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.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/README
modules/org.openbravo.client.kernel/jsformatter/README.md
modules/org.openbravo.client.kernel/jsformatter/jsformatter
modules/org.openbravo.client.kernel/jsformatter/jsformatter-hg
modules/org.openbravo.client.kernel/jsformatter/jsformatter-hg-hook
modules/org.openbravo.client.kernel/jslint/README.md
modules/org.openbravo.client.kernel/jslint/filter-eslint-ignored-files.js
modules/org.openbravo.client.kernel/jslint/jslint
modules/org.openbravo.client.kernel/jslint/jslint-hg
modules/org.openbravo.client.kernel/jslint/jslint-hg-hook
modules/org.openbravo.client.kernel/jsutils/check-npm-deps
modules/org.openbravo.client.kernel/jsutils/dir-functions
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.kernel/src/org/openbravo/client/kernel/ComponentGenerator.java
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-dynamic-js.ftl
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/docs.js.ftl
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl
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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
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.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
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.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
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/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.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
package-lock.json
package.json
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_VAL_RULE.xml
src-test/src/org/openbravo/test/base/TestConstants.java
src/org/openbravo/common/actionhandler/createlinesfromprocess/CreateLinesFromUtil.java
src/org/openbravo/common/actionhandler/createlinesfromprocess/UpdateQuantitiesAndUOMs.java
src/org/openbravo/dal/xml/XMLUtil.java
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java
--- a/.hgsigs	Mon Jul 15 06:38:43 2019 +0000
+++ b/.hgsigs	Mon Jul 22 05:12:26 2019 +0000
@@ -248,3 +248,4 @@
 10080fe6bda147693cc393a808d1c3b08717dff3 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXNFiOQAKCRAJf+gZ/7aqQy9/AJ4uFDZAAKj7w4tDqWvjCgiwisMgLACfVhQYjql8qv4znV+JqTvNwQsa9Y0=
 3c7b774172eaefb759b7971d58179849cdddc529 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXSgXkAAKCRAJf+gZ/7aqQ+xDAKC/aqDVDRUzZ/bwn31twvAh58yKzgCeI2F7X87wh0jmoUu7JtJ7h0IcAyE=
 edfc7e0681c503730dc95a54d3453e65bf3d84b4 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXNQYcQAKCRAJf+gZ/7aqQ/W4AKDjpetja4KWDlW8sIIhgQI+NpP3cACeIPbP1VzxSdFsO/DXBjKzUT4O8gc=
+7dc73c2aaa2f8623ed3db6f350037f966a507cc7 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXTBfbAAKCRAJf+gZ/7aqQ31pAKCE18krgntCZv2ZB8be3Nv+j+A3/wCffDksyhOTSB6/+FOGrK+BfUjxaqs=
--- a/.hgtags	Mon Jul 15 06:38:43 2019 +0000
+++ b/.hgtags	Mon Jul 22 05:12:26 2019 +0000
@@ -259,3 +259,4 @@
 5a9355cfa0e6a56f4eeba25c54650ab5c139121e 3.0PR19Q1.1
 76a3e2f6617119e803c4b3a218bdc650b586121e 3.0PR19Q1.2
 5f8913c80af55c56243869979d07a219f902b1ce 3.0PR19Q2
+a1b4e77775537cfc7e0632124c05793bd1cfddae 3.0PR19Q2.1