[MERGE] forward port of branch saas-3 up to 8c4a7cb
authorDenis Ledoux <dle@odoo.com>
Tue, 4 Nov 2014 11:30:01 +0000 (12:30 +0100)
committerDenis Ledoux <dle@odoo.com>
Tue, 4 Nov 2014 11:30:01 +0000 (12:30 +0100)
commitf7723037d69ed4e47518913654202c298984a14e
treee371ee733ee5a3b06329e4d5bba927193b7132c9
parentc3f355b8607069175009cbffba1fd3ac10c4d125
parent8c4a7cb37143285da0a1a25d0d5e720c45e4346a
[MERGE] forward port of branch saas-3 up to 8c4a7cb
.gitignore
addons/account/account_invoice.py
addons/base_action_rule/base_action_rule.py
addons/marketing_campaign/marketing_campaign_view.xml
addons/payment_paypal/models/paypal.py
addons/product/product.py
addons/project_issue/project_issue.py
addons/web/static/src/js/view_form.js