[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113...
authorChristophe Simonis <chs@openerp.com>
Tue, 10 Sep 2013 12:48:03 +0000 (14:48 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 10 Sep 2013 12:48:03 +0000 (14:48 +0200)
commit3fa90321e11d28df4e2b874ddfa450dc73e8e0af
tree91546d220e866fa6fb1807f1e8b44c5c28a6bc76
parent4327e09a55e74e59e6c0ae41883951d41e7146e5
parent546a191f0a790415317c55f41e30ced88bfc143b
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry

bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
24 files changed:
addons/account/account.py
addons/account/account_invoice.py
addons/account/account_invoice_view.xml
addons/analytic/analytic.py
addons/base_calendar/base_calendar.py
addons/crm/crm.py
addons/crm/crm_lead.py
addons/email_template/email_template.py
addons/hr_expense/hr_expense.py
addons/hr_recruitment/hr_recruitment.py
addons/mail/mail_group.py
addons/mail/res_users.py
addons/membership/membership_view.xml
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/static/src/js/devices.js
addons/product/pricelist.py
addons/product/product.py
addons/product/product_view.xml
addons/project/project.py
addons/project_mrp/process/project_mrp_process.xml
addons/purchase/partner.py
addons/stock/stock.py