[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 6 Jan 2014 13:57:00 +0000 (14:57 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 6 Jan 2014 13:57:00 +0000 (14:57 +0100)
commit49c0b7a82003a889edc19cb189d0d6d0ebda2c5f
treed24c9d3fe3baad3ba06f11d4bf334e2504fb6092
parentc4c268c902a134efdf0f097053c9b28d6b14417c
parentced63415b7319e12fb9d31a3e370850278f697c1
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
addons/account/account_view.xml
addons/email_template/wizard/mail_compose_message.py
addons/hr/hr_demo.xml
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/mrp/report/price.py
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/sale/sale.py