[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 14 May 2014 15:21:54 +0000 (17:21 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 14 May 2014 15:21:54 +0000 (17:21 +0200)
commitae89496bbcbd8cc8daa645b2266bd87d1b57e84d
tree8ffd7563fa7adce92cfe6db7290b38bdeb34d93b
parente53c7748a0a19f24a776e8b440cfe993efb3b3c1
parenteadc8528ca2f4afc2ea9bfc130352505299e5963
[MERGE] Sync with trunk
addons/crm/sales_team.py
addons/crm/sales_team_view.xml
addons/sale/sales_team.py
addons/sale/sales_team_view.xml
addons/sale_crm/sale_crm.py
addons/sales_team/sales_team.xml
addons/website_sale/controllers/main.py