Merge lp://staging/~initos.com/openerp-hr/7.0-change-public-holiday into lp://staging/openerp-hr
Status: | Rejected |
---|---|
Rejected by: | Sandy Carter (http://www.savoirfairelinux.com) |
Proposed branch: | lp://staging/~initos.com/openerp-hr/7.0-change-public-holiday |
Merge into: | lp://staging/openerp-hr |
Diff against target: |
86 lines (+22/-2) 2 files modified
hr_public_holidays/hr_public_holidays.py (+5/-1) hr_public_holidays/hr_public_holidays_view.xml (+17/-1) |
To merge this branch: | bzr merge lp://staging/~initos.com/openerp-hr/7.0-change-public-holiday |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sandy Carter (http://www.savoirfairelinux.com) | Needs Resubmitting | ||
Michael Telahun Makonnen | Needs Fixing | ||
Leonardo Pistone | Abstain | ||
Markus Schneider (community) | Approve | ||
Review via email: mp+224610@code.staging.launchpad.net |
Description of the change
In the module hr_public_holidays were added field 'country_id' in the 'hr.holidays.
The reason is that we can have multi country companies and each country has different holidays as well as in some countries there are different holidays for each state.
By adding these fields we can configure different list of holidays for every country, and add list of states to every holiday.
Unmerged revisions
- 83. By Nikolina Nikolova Todorova
-
change is_public_holiday and get_holidays_list function to handle the new country/state functionality
- 82. By Nikolina Nikolova Todorova
-
change sql_constraints to accept duplicated year if the country is different
- 81. By Nikolina Nikolova Todorova
-
add country_id and state_ids to the module
thak you, know we can handle holidays in germany correct