diff --git a/CHANGELOG.md b/CHANGELOG.md index 41336cfd7..cab782b12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,13 @@ - Ability to select "bank transfer" as the payment mean for a payment schedule - When a payment schedule was canceled by the payment gateway, alert the users - When a payment schedule is in error, alert the users -- Updated caniuse db +- Specilized VAT rate cannot be defined unless the VAT is enabled and saved - Fix card image ratio - Update events heading style - Update some icons - Optimized the load time of the payment schedules list - Optimized multiple DB queries +- Updated caniuse db - Fix a bug: do not load Stripe if no keys were defined - Fix a bug: some links redirect to the home page instead of triggering the requested action - Fix a bug: exports to Excel are corrupted (#49) diff --git a/app/frontend/src/javascript/controllers/admin/invoices.js b/app/frontend/src/javascript/controllers/admin/invoices.js index c78f857ec..fe7794a4b 100644 --- a/app/frontend/src/javascript/controllers/admin/invoices.js +++ b/app/frontend/src/javascript/controllers/admin/invoices.js @@ -476,6 +476,8 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I controller: ['$scope', '$uibModalInstance', 'rate', 'active', 'rateHistory', 'activeHistory', 'multiVAT', function ($scope, $uibModalInstance, rate, active, rateHistory, activeHistory, multiVAT) { $scope.rate = rate; $scope.isSelected = active; + // this one is read only + $scope.isActive = active; $scope.history = []; // callback on "enable VAT" switch toggle diff --git a/app/frontend/templates/admin/invoices/settings/editVAT.html b/app/frontend/templates/admin/invoices/settings/editVAT.html index e6f253268..ad4c3a20d 100644 --- a/app/frontend/templates/admin/invoices/settings/editVAT.html +++ b/app/frontend/templates/admin/invoices/settings/editVAT.html @@ -51,7 +51,7 @@