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

f7432efb

Commit f7432efb authored 9 years ago by Christophe Simonis

Downloads
- Plain Diff

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

parents 686b0396 07d71478

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

addons/account/models/account.py 1 addition, 1 deletion

addons/account/models/account.py
addons/marketing_campaign/marketing_campaign.py 1 addition, 1 deletion

addons/marketing_campaign/marketing_campaign.py
addons/point_of_sale/tools/posbox/configuration/connect_to_wifi.sh 16 additions, 3 deletions

...int_of_sale/tools/posbox/configuration/connect_to_wifi.sh
addons/report/models/report.py 8 additions, 8 deletions

addons/report/models/report.py
openerp/addons/base/ir/ir_model.py 17 additions, 16 deletions

openerp/addons/base/ir/ir_model.py
openerp/api.py 10 additions, 0 deletions

openerp/api.py
openerp/models.py 5 additions, 5 deletions

openerp/models.py

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