From 6dc7a7edd9ae7728781a209b1631501914db3dc5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Mar 2020 15:39:05 +0200 Subject: [PATCH] [bug] unable to export accounting data to ACD --- CHANGELOG.md | 1 + app/assets/javascripts/controllers/admin/invoices.js.erb | 5 +++-- .../templates/admin/invoices/accountingExportModal.html | 2 +- package.json | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5135b8db5..766ac5b42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Fix a bug: since PostgreSQL release 9.6.17, the new installations will fail to start complaining for missing password (#194) - Fix a bug: missing translations for some error messages - Fix a bug: invalid footprints in invoices fixtures +- Fix a bug: unable to export accounting data to ACD - Fix a security issue: updated mkdirp to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598) - Fix a security issue: updated acorn to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598) diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb index c5bd0c3b6..381272707 100644 --- a/app/assets/javascripts/controllers/admin/invoices.js.erb +++ b/app/assets/javascripts/controllers/admin/invoices.js.erb @@ -1117,9 +1117,10 @@ Application.Controllers.controller('AccountingExportModalController', ['$scope', /** * Will fill the export settings, according to the selected software + * @param software {String} must be one of SETTINGS.* */ - $scope.fillSettings = function() { - $scope.exportTarget.settings = SETTINGS[$scope.exportTarget.software]; + $scope.fillSettings = function(software) { + $scope.exportTarget.settings = SETTINGS[software]; }; /** diff --git a/app/assets/templates/admin/invoices/accountingExportModal.html b/app/assets/templates/admin/invoices/accountingExportModal.html index d1782e8d7..4c952b4c9 100644 --- a/app/assets/templates/admin/invoices/accountingExportModal.html +++ b/app/assets/templates/admin/invoices/accountingExportModal.html @@ -45,7 +45,7 @@

{{ 'app.admin.invoices.export_to' }}

diff --git a/package.json b/package.json index d289387b0..e221f2e0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.3.2", + "version": "4.3.3-dev", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab",