Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Bemessungsgrundlage for ges_krankenv Selbstständige #405

Merged
merged 25 commits into from
Mar 22, 2023
Merged

Fix Bemessungsgrundlage for ges_krankenv Selbstständige #405

merged 25 commits into from
Mar 22, 2023

Commits on Jul 5, 2022

  1. added min.einkommen for bemessungsgrundlage selbst

    @JHermann99
    JHermann99 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    a5235c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen

    @JHermann99
    JHermann99 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    66bf9fe View commit details
    Browse the repository at this point in the history

  3. switched to betragsbemessungsgrenze for selbstst

    @JHermann99
    JHermann99 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    3f2dbe9 View commit details
    Browse the repository at this point in the history

  4. minor rearrangement

    @JHermann99
    JHermann99 committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    604289a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen

    @ChristianZimpelmann
    ChristianZimpelmann committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    4faadcc View commit details
    Browse the repository at this point in the history

  2. fixed and added tests, fixed beitragssatz

    @JHermann99
    JHermann99 committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    082f0eb View commit details
    Browse the repository at this point in the history

  3. minor

    @JHermann99
    JHermann99 committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    73bcf1f View commit details
    Browse the repository at this point in the history

  4. minor changes to documentation and formatting.

    @ChristianZimpelmann
    ChristianZimpelmann committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    38d3ef5 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. WIP, intruduced Parameter, changes to CHANGES.rst

    @JHermann99
    JHermann99 committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    f0b390f View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    deffc72 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen

    @ChristianZimpelmann
    ChristianZimpelmann committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    d70067b View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. fix implementation of parameter.

    @ChristianZimpelmann
    ChristianZimpelmann committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    883178d View commit details
    Browse the repository at this point in the history

  2. solve merge conflicts.

    @ChristianZimpelmann
    ChristianZimpelmann committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    9ca1725 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen

    @hmgaudecker
    hmgaudecker committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    bc5aa7c View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    c1c0a84 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen

    @JHermann99
    JHermann99 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    2d21555 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    a66b9fa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'iza-institute-of-labor-economics:main' into ges_kranken… 

    …v_selbst_mindesteinkommen
    @JHermann99
    JHermann99 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    8b3d57d View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. WIP added new tests and fixed old

    @JHermann99
    JHermann99 committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    dc44bc5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ges_krankenv_selbst_mindesteinkommen 

    `src/_gettsim_tests/test_data/sozialv_beitr.csv` from main, will need update.
    @hmgaudecker
    hmgaudecker committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    21dfabd View commit details
    Browse the repository at this point in the history

  3. Make vectorization test pass.

    @hmgaudecker
    hmgaudecker committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    4123738 View commit details
    Browse the repository at this point in the history

  4. Run pre-commit.

    @hmgaudecker
    hmgaudecker committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    1cb89ca View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Merge remote-tracking branch 'origin/main' into ges_krankenv_selbst_m… 

    …indesteinkommen
    @hmgaudecker
    hmgaudecker committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    ad65604 View commit details
    Browse the repository at this point in the history

  2. Merge test data (remove outdated test, add new ones from Jonas).

    @hmgaudecker
    hmgaudecker committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    807123a View commit details
    Browse the repository at this point in the history

  3. Remove outdated ods file.

    @hmgaudecker
    hmgaudecker committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    7b4cf16 View commit details
    Browse the repository at this point in the history