master #221

Merged

mpeltriaux merged 4 commits from master into Docker

mpeltriaux commented

Owner

Update Docker

mpeltriaux added 4 commits

2129855068 Fix for recorded deduction

* fixes bug where deduction of a recorded intervention could be deleted from the eco account detail view
* improves check_for_recorded_instance() logic
* improves rendering of detail view on compensation-like objects to highlight missing data

96ee94583f Fixes account deletion with deductions

* adds a warning on removing an eco account if there are still deductions
    * this way a user needs to get rid of these deductions first

587b828574 Test extension

* adds further checks on EcoAccount tests for proper updating of new deductable_rest attribute

7235110b7d Merge pull request '217_Prevent_recorded_deduction_deletion' (#220 ) from 217_Prevent_recorded_deduction_deletion into master

Reviewed-on: SGD-Nord/konova#220

mpeltriaux merged commit 63a308b6cb into Docker 2 years ago

mpeltriaux referenced this issue from a commit

Merge pull request 'master' (#221) from master into Docker

The pull request has been merged as 63a308b6cb.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b master Docker

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout Docker

git merge --no-ff master

git push origin Docker

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

master #221

Step 1:

Step 2: