Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !140

Merged
Opened Apr 11, 2025 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

add params to household allowance calculation & add allowance cap at calculation with param

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b 7916-add-params-to-household-allowance-calculation origin/7916-add-params-to-household-allowance-calculation

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout develop
git merge --no-ff 7916-add-params-to-household-allowance-calculation

Step 4. Push the result of the merge to GitLab

git push origin develop

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 4
  • Changes 7
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • c447632f - fix calculation error

    Compare with previous version

    Apr 11, 2025

    added 1 commit

    • c447632f - fix calculation error

    Compare with previous version

    added 1 commit <ul><li>c447632f - fix calculation error</li></ul> [Compare with previous version](https://gl.cooperatic.fr/agplv3/kohinos-tav/merge_requests/140/diffs?diff_id=3963&start_sha=81b9fdeb6be07a204f9f790313907d7c464dfe0b)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • e03379b1 - add param to set or not a cotisation minimum

    Compare with previous version

    Apr 11, 2025

    added 1 commit

    • e03379b1 - add param to set or not a cotisation minimum

    Compare with previous version

    added 1 commit <ul><li>e03379b1 - add param to set or not a cotisation minimum</li></ul> [Compare with previous version](https://gl.cooperatic.fr/agplv3/kohinos-tav/merge_requests/140/diffs?diff_id=3964&start_sha=c447632fa5af961d7cf67ea5785d85630e7a85f6)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • f6a0440b - use proper global variable to check if shared custody should be used

    Compare with previous version

    Apr 14, 2025

    added 1 commit

    • f6a0440b - use proper global variable to check if shared custody should be used

    Compare with previous version

    added 1 commit <ul><li>f6a0440b - use proper global variable to check if shared custody should be used</li></ul> [Compare with previous version](https://gl.cooperatic.fr/agplv3/kohinos-tav/merge_requests/140/diffs?diff_id=3966&start_sha=e03379b1ce1d26b416e95c3e4b345aebeb09ab98)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Apr 14, 2025

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 5a776250

    Apr 14, 2025

    mentioned in commit 5a776250

    mentioned in commit 5a776250dedc0014e5579bffe583bb0e28adc30e
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: agplv3/kohinos-tav!140
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.