[MERGE] sync with trunk
authorChristophe Matthieu <chm@openerp.com>
Mon, 2 Dec 2013 15:09:25 +0000 (16:09 +0100)
committerChristophe Matthieu <chm@openerp.com>
Mon, 2 Dec 2013 15:09:25 +0000 (16:09 +0100)
commitfd2821086f2d1e1c46955e83c1b376bf5870235c
tree3ea8f083280a4409b15764b41a9aeb977b866cff
parent3d01f870db54a615dce629a89b24b87632865571
parent57ef91409a99fe84b773c558298af52144d8b74d
[MERGE] sync with trunk

bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
18 files changed:
addons/auth_signup/res_users.py
addons/crm_partner_assign/__openerp__.py
addons/crm_partner_assign/crm_partner_assign.py
addons/hr/hr.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/mail/mail_thread.py
addons/mail/static/src/js/mail.js
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/portal/portal_demo.xml
addons/portal/tests/test_portal.py
addons/portal_hr_employees/hr_employee.py
addons/product/product.py
addons/project_issue/project_issue.py
addons/purchase/purchase_view.xml
addons/sale/sale.py
addons/stock/wizard/stock_fill_inventory.py