Merge branch 'servier_holidays_changes' into '12.0-stage' (45808451) · Commits · Servier / servier_custom · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

servier_custom
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

45808451

Commit 45808451 authored 5 years ago by Marco Folco

Downloads
- Plain Diff

Merge branch 'servier_holidays_changes' into '12.0-stage'

[MOD]Servier_custom

See merge request !28

parents ba0e2d57 9ebbb039

No related branches found

No related tags found

2 merge requests!3212.0 stage,!28[MOD]Servier_custom

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

i18n/es_AR.mo 0 additions, 0 deletions

i18n/es_AR.mo
i18n/es_AR.po 71 additions, 10 deletions

i18n/es_AR.po
models/hr_leave.py 145 additions, 1 deletion

models/hr_leave.py
models/hr_leave_allocation.py 39 additions, 5 deletions

models/hr_leave_allocation.py
models/hr_leave_assign.py 4 additions, 3 deletions

models/hr_leave_assign.py
models/hr_leave_type.py 42 additions, 0 deletions

models/hr_leave_type.py
security/ir.model.access.csv 2 additions, 0 deletions

security/ir.model.access.csv

with 303 additions and 19 deletions

Loading

0% Loading 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