Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Coopdevs OCB mirror
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- External wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a35aec2a

Commit a35aec2a authored 10 years ago by Christophe Simonis

Downloads
- Plain Diff

[MERGE] forward port of branch 7.0 up to 6e96ffd4

parents 4d6b8910 6e96ffd4

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

addons/email_template/email_template.py 3 additions, 3 deletions

addons/email_template/email_template.py
addons/hr_holidays/report/holidays_summary_report.py 1 addition, 3 deletions

addons/hr_holidays/report/holidays_summary_report.py
addons/stock/security/ir.model.access.csv 1 addition, 1 deletion

addons/stock/security/ir.model.access.csv
openerp/addons/base/ir/ir_model.py 9 additions, 1 deletion

openerp/addons/base/ir/ir_model.py
openerp/osv/orm.py 4 additions, 1 deletion

openerp/osv/orm.py
openerp/tools/config.py 1 addition, 1 deletion

openerp/tools/config.py

with 19 additions and 10 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