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

bfbe2d6e

Commit bfbe2d6e authored 8 years ago by Christophe Simonis

Downloads
- Plain Diff

[MERGE] forward port of branch saas-6 up to df95b1fc

The changes in `l10n_es` [1] have been ignored. They will be ported to
the new accouting later.

[1] See 730890f3 and e3e5cfe8

parents c12c0976 df95b1fc

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

addons/base_import/static/src/js/import.js 4 additions, 2 deletions

addons/base_import/static/src/js/import.js
addons/hr_payroll/hr_payroll.py 6 additions, 4 deletions

addons/hr_payroll/hr_payroll.py
addons/hw_scanner/controllers/main.py 65 additions, 48 deletions

addons/hw_scanner/controllers/main.py
addons/l10n_fr_hr_payroll/report/fiche_paye.py 1 addition, 1 deletion

addons/l10n_fr_hr_payroll/report/fiche_paye.py
addons/procurement/procurement.py 1 addition, 1 deletion

addons/procurement/procurement.py
addons/website_quote/models/order.py 1 addition, 0 deletions

addons/website_quote/models/order.py
doc/cla/individual/jordanvrtanoski.md 11 additions, 0 deletions

doc/cla/individual/jordanvrtanoski.md
doc/cla/individual/kler.md 12 additions, 0 deletions

doc/cla/individual/kler.md
doc/cla/individual/sheltonfreddy.md 11 additions, 0 deletions

doc/cla/individual/sheltonfreddy.md
openerp/http.py 5 additions, 2 deletions

openerp/http.py

with 117 additions and 58 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