details: https://code.openbravo.com/erp/devel/pi/rev/02638ff47292 changeset: 35336:02638ff47292 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Jan 21 16:55:41 2019 +0100 summary: Fixed issue 39982: Clean up javascript code.
In order to be compliant of new versions of ESLint, some changes have to be performed in current javascript code. This changeset adds a line break at the end of .js files when necessary. details: https://code.openbravo.com/erp/devel/pi/rev/b0a745abbd2b changeset: 35337:b0a745abbd2b user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Jan 21 16:57:20 2019 +0100 summary: Related to issue 39982: Clean up javascript code. This changeset fixes all errors detected by ESLint details: https://code.openbravo.com/erp/devel/pi/rev/88e72b6054e0 changeset: 35338:88e72b6054e0 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Jan 21 16:58:30 2019 +0100 summary: Related to issue 39982: Clean up javascript code. This changeset removes all warning detected by ESLint, mostly related to unused variables. details: https://code.openbravo.com/erp/devel/pi/rev/f6f096631204 changeset: 35339:f6f096631204 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Jan 21 17:00:48 2019 +0100 summary: Related to issue 39982: Clean up javascript code. This changeset fixed ESLint warnings related to regexp escape characters. Included a QUnit test case for one change. diffstat: modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 41 +++--- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 13 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 16 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/example/grid-example.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 40 ++++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 26 +--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/callback/ob-extra-window-settings-actions.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-help.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-popup.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/costing/ob-lc-matchfrominvoice.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datechooser.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linktitle.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 18 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 18 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section-audit.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-form-button.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 37 ++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 56 +++------ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-base-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-layout.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-notes-datasource.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 30 ++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 21 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-logout-widget.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-attachment-window-view.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-datasource.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 20 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-navbar-test.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-property-store-test.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-ui-test.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-date-test.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-valid-url-test.js | 29 +++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-clone-order.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-eventhandler.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-external-page.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-function-registry.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-popup.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-property-store.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-recent-utilities.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-remote-call-manager.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-section-stack.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-test-registry.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-style.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 20 +- modules/org.openbravo.client.htmlwidget/web/org.openbravo.client.htmlwidget/js/ob-html-widget.js | 2 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/test-compression.js | 27 +---- modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/ob-i18n.js | 2 +- modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/ob-kernel-utilities.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js | 8 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-calendar-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 12 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-view.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 16 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-showparameter-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 7 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js | 12 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-canvas-item.js | 2 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js | 2 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 11 +- modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-gcal.js | 2 +- modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-twitter.js | 2 +- modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js | 2 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js | 5 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-formitem-fk-combo.js | 2 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js | 2 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js | 2 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 18 +-- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js | 5 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 20 +-- 151 files changed, 470 insertions(+), 614 deletions(-) diffs (truncated from 4381 to 300 lines): diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Jan 21 17:00:48 2019 +0100 @@ -3,7 +3,6 @@ displayLogicElement, returnFormattedNumber, returnFormattedToCalc, roundNumber, returnCalcToFormatted, setWindowElementFocus, showJSMessage, initialize_MessageBox, updateData, top, getFrame*/ - /* ************************************************************************* * The contents of this file are subject to the Openbravo Public License @@ -17,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2013 Openbravo SLU + * All portions are Copyright (C) 2010-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -38,6 +37,7 @@ return frm.elements[objectName].value === 'Y'; } +/* exported initFIN_Utilities */ function initFIN_Utilities(_frm, _creditAllowed, _isCreditCheckedFromBPinGrid, _isGLItemEnabled) { frm = _frm; isReceipt = isTrue('isReceipt'); @@ -59,6 +59,7 @@ globalMaskNumeric = globalMaskNumeric || getDefaultMaskNumeric(); } +/* exported processLabels */ function processLabels() { var receiptlbls = getElementsByName('lblR'), i; @@ -97,7 +98,7 @@ * @return The converted number * @type String */ - +/* exported applyFormatJSToOBMasked */ function applyFormatJSToOBMasked(number, _globalMaskNumeric) { if (!_globalMaskNumeric) { _globalMaskNumeric = globalMaskNumeric; @@ -105,6 +106,7 @@ return OB.Utilities.Number.JSToOBMasked(number, _globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); } +/* exported applyFormatOBMaskedToJS */ function applyFormatOBMaskedToJS(number) { return OB.Utilities.Number.OBMaskedToJS(number, globalDecSeparator, globalGroupSeparator); } @@ -209,7 +211,7 @@ * @return The result of dividing number1 to number2 using the global formats. * @type String */ - +/* exported divide */ function divide(number1, number2) { return formattedNumberOpTemp(number1, '/', number2, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); } @@ -221,7 +223,7 @@ * @return The result of multiplying number1 to number2 using the global formats. * @type String */ - +/* exported multiply */ function multiply(number1, number2) { return formattedNumberOpTemp(number1, '*', number2, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); } @@ -261,7 +263,7 @@ } function applyPrecisionToMask(currencyPrecision) { - var i, c, output, currentDecimalMask, currentPrecision; + var i, c, currentDecimalMask, currentPrecision; var toConvertDecimalMask = globalMaskNumeric; if (globalMaskNumeric.indexOf(globalDecSeparator) !== -1) { currentDecimalMask = globalMaskNumeric.substring(globalMaskNumeric.indexOf(globalDecSeparator), globalMaskNumeric.length); @@ -346,14 +348,9 @@ function updateDifference() { var expected = (frm.inpExpectedPayment && frm.inpExpectedPayment.value) ? frm.inpExpectedPayment.value : applyFormat('0'), total = (frm.inpTotal && frm.inpTotal.value) ? frm.inpTotal.value : applyFormat('0'), - amount = total, - invoicedAmount = total; + amount = total; var exchangeRate = frm.inpExchangeRate; - if (isGLItemEnabled) { - invoicedAmount = frm.inpInvoiceAmount.value; - } - if (frm.inpActualPayment !== null) { amount = frm.inpActualPayment.value; } @@ -508,6 +505,7 @@ updateConvertedAmounts(); } +/* exported distributeAmount */ function distributeAmount(_amount) { var amount = applyFormat(_amount); var distributedAmount = 0; @@ -588,6 +586,7 @@ return true; } +/* exported updateReadOnly */ function updateReadOnly(key, mark) { if (mark === null) { mark = false; @@ -618,6 +617,7 @@ return true; } +/* exported updateAll */ function updateAll(drivenByGrid) { var frm = document.frmMain; var chk = frm.inpScheduledPaymentDetailId; @@ -654,7 +654,7 @@ * zero. * @return true if validations are fine. */ - +/* exported validateSelectedPendingPayments */ function validateSelectedPendingPayments(allowNotSelectingPendingPayment, action) { if (allowNotSelectingPendingPayment === undefined) { allowNotSelectingPendingPayment = false; @@ -662,8 +662,7 @@ // If no credit usage is allowed we are forced to select at least one pending payment. allowNotSelectingPendingPayment = isCreditAllowed && allowNotSelectingPendingPayment; var actualPayment = document.frmMain.inpActualPayment.value; - var expectedPayment = document.frmMain.inpExpectedPayment.value, - i; + var i; if (document.frmMain.inpUseCredit.checked) { /*if ( compare(expectedPayment, '<=', actualPayment) ) { setWindowElementFocus(document.frmMain.inpUseCredit); @@ -722,7 +721,7 @@ * @param innerHTML * The string with the options. Example '<option value="id1">fist<option>' */ - +/* exported createCombo */ function createCombo(object, innerHTML) { object.innerHTML = ""; var selTemp = document.createElement("temp"); @@ -753,7 +752,9 @@ try { opt.setAttribute(attrName, attrVal); opt.setAttributeNode(spantemp.attributes[j].cloneNode(true)); - } catch (e) {} + } catch (e) { + // Ignore exceptions + } } } //value and text @@ -772,7 +773,7 @@ * Helper function to reload the opener window dynamic grid. * @return */ - +/* exported reloadParentGrid */ function reloadParentGrid() { var f, dad, layoutMDI, popup; try { @@ -802,11 +803,11 @@ * Helper function to turn a JSON string representation into an object. * @param jsonString */ - +/* exported decodeJSON */ function decodeJSON(jsonString) { try { return eval('(' + jsonString + ')'); // do the eval } catch (e) { throw new SyntaxError("Invalid JSON string: " + e.message + " parsing: " + jsonString); } -} \ No newline at end of file +} diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Mon Jan 21 17:00:48 2019 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2014-2018 Openbravo SLU + * All portions are Copyright (C) 2014-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -500,12 +500,10 @@ credit = new BigDecimal(String(form.getItem('used_credit').getValue() || 0)), differenceItem = form.getItem('difference'), expectedDifferenceItem = form.getItem('expectedDifference'), - receivedFrom = form.getItem('received_from').getValue() || '', totalGLItems = new BigDecimal(String(form.getItem('amount_gl_items').getValue() || 0)), diffAmt = actualPayment.add(credit).subtract(total), expectedDiffAmt = expectedPayment.add(credit).subtract(total).add(totalGLItems), - affectedParams = [], - displayLogicValues = {}; + affectedParams = []; differenceItem.setValue(Number(diffAmt.toString())); if (expectedDiffAmt.signum() === 0) { expectedDifferenceItem.setValue(Number(diffAmt.toString())); @@ -706,7 +704,7 @@ glItemTotalItem = form.getItem('amount_gl_items'), issotrx = form.getItem('issotrx').getValue(), affectedParams = [], - amt, i, bdAmt, receivedInAmt, paidOutAmt, allRecords; + i, receivedInAmt, paidOutAmt, allRecords; grid.saveAllEdits(); // allRecords should be initialized after grid.saveAllEdits() @@ -907,7 +905,7 @@ */ OB.APRM.AddPayment.orderAndRemoveDuplicates = function (val) { var valArray = val.replaceAll(' ', '').split(',').sort(), - retVal, length; + retVal; valArray = valArray.filter(function (elem, pos, self) { return self.indexOf(elem) === pos; @@ -1115,7 +1113,6 @@ overpaymentAction = overpaymentField.getValue(), creditTotalItem = new BigDecimal(String(view.theForm.getItem('used_credit').getValue() || 0)), document = (view.theForm.getItem('trxtype')) ? view.theForm.getItem('trxtype').getValue() : "", - amountField = orderInvoiceGrid.getFieldByColumnName('amount'), selectedRecords = orderInvoiceGrid.getSelectedRecords(), writeOffLimitPreference = OB.PropertyStore.get('WriteOffLimitPreference', view.windowId), totalWriteOffAmount = BigDecimal.prototype.ZERO, @@ -1209,4 +1206,4 @@ selectedRecords: selectedRecords, finFinancialAccount: finFinancialAccount }, {}, callbackOnProcessActionHandler); -}; \ No newline at end of file +}; diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js Mon Jan 21 17:00:48 2019 +0100 @@ -137,4 +137,4 @@ form.getItem('depositamt').setValue(Number('0')); } } -}; \ No newline at end of file +}; diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js Mon Jan 21 17:00:48 2019 +0100 @@ -65,4 +65,4 @@ clientSideValidationFail(); } } -}; \ No newline at end of file +}; diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js Mon Jan 21 17:00:48 2019 +0100 @@ -41,4 +41,4 @@ description.setValue(OB.I18N.getLabel('FundsTransfer')); } -}; \ No newline at end of file +}; diff -r 9f730ec444e7 -r f6f096631204 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js Mon Jan 21 10:59:28 2019 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js Mon Jan 21 17:00:48 2019 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2014-2015 Openbravo SLU + * All portions are Copyright (C) 2014-2019 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -60,8 +60,7 @@ grid.dataSourceOrig = grid.dataSource; grid.dataSource = null; execute = function (ok) { - var onLoadCallback, newCriteria = {}, - params = {}; + var onLoadCallback, params = {}; if (grid.view.sourceView) { params.context = grid.view.sourceView.getContextInfo(); } @@ -144,7 +143,7 @@ grid = me.grid, record = me.record, standardWindow = grid.view.parentWindow.view.standardWindow, - process, callback, bankStatementLineId = me.record.id, + callback, bankStatementLineId = me.record.id, _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
