-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
[WIP] Add organ donor compensation #16
Open
MattiSG
wants to merge
28
commits into
BetterRules:master
Choose a base branch
from
OrganicCoders:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
7818fa5
First basic test
nigelcharman 0d6a6f7
Added tax code and after tax amount
nigelcharman fbe6036
Commented out tax implications
nigelcharman cc92a5c
Initial test passing
nigelcharman 090f12d
Tidy up
nigelcharman 2cd9f23
Merge pull request #2 from OrganicCoders/tests
nigelcharman 6800008
Changed to 52 week calculation
nigelcharman 2995ce2
Merge branch 'tests'
nigelcharman 0f810b5
Applied rounding, commented out unneeded code
nigelcharman b472181
Added subpart 1 5(3) compensation earnings disregarded
nigelcharman b2d7db2
Added self-employed earnings
nigelcharman dbbfcf6
Added kiwisaver
nigelcharman bc00352
Added reference to definition
nigelcharman 36822d7
Added reference to definition
nigelcharman b958b43
Update live_organ_donor_compensation.py
allengeer e68ff34
Merge pull request #3 from allengeer/patch-1
nigelcharman 0c7ee37
Removed commented out code
nigelcharman 067d5cb
Added references to legislation
nigelcharman f138396
Fixed comments and removed kiwisaver_member variable
nigelcharman 429becd
Merge branch 'master' of github.com:OrganicCoders/openfisca-aotearoa
nigelcharman 2e507ed
Added docstring comment
nigelcharman 82a8810
Fixed formatting so tests pass when using 'make test'
nigelcharman d78b98f
Added reference to KiwiSaver rate
nigelcharman 2aaaf2b
Removed space at end of string
nigelcharman 5fbe05f
Added definitions of 'number of weeks' and 'earnings as an employee'
nigelcharman 64c5842
Updated references to definitions
nigelcharman 74b15f3
Merge pull request #4 from OrganicCoders/data-definitions
nigelcharman 21e69e5
Updated references to definitions on master branch
nigelcharman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# DEFINITIONS: EARNINGS AS AN EMPLOYEE | ||
|
||
**Term name:** EarningsAsAnEmployee | ||
|
||
**UUID:** organiccoders/brk:/1234/ed84652e-8011-43dc-aeef-72e5ad3593f4 | ||
|
||
**Definition:** Earnings as an employee, in relation to any person and any tax year, means all PAYE income payments of the person for the tax year. | ||
|
||
**Legislation:** Schedule 2/Part1/5 Compensation for Live Organ Donors Act 2016 | ||
|
||
**Refers to:** earnings as an employee has the meaning given by section 6(1) of the Accident Compensation Act 2001 | ||
|
||
**Narrower than:** ‘Earnings’ | ||
|
||
**Related:** ‘Employee’ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# DEFINITIONS: NUMBER OF WEEKS | ||
|
||
**Term name:** NumberOfWeeks | ||
|
||
**UUID:** organiccoders/brk:/1234/12a0780a-b516-44f1-bdb7-6ec4b6c3e174 | ||
|
||
**Definition:** number of weeks is (a) the number of full weeks plus any part week (expressed as a portion of a week), if the period is 1 week or more; and (b) a part week (expressed as a portion of a week), if the period is less than 1 week | ||
|
||
**Legislation:** Part 1, Section 4 | ||
|
||
**Narrower than:** http://purl.org/dc/terms/LocationPeriodOrJurisdiction | ||
|
||
**Related:** PeriodOfTime (altLabel:Period) | ||
|
||
**Note:** Time event (ref DCAT temporal purl.org/dc/terms/temporal) or CPSV ‘period of time’ An interval of time that is named or defined by its start and end dates. http://purl.org/dc/terms/PeriodOfTime |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not a stable URL: if the file gets renamed it would yield a 404. You can obtain a stable URL by navigating to this URL and pressing
y
on your keyboard 🙂