Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

Conflicts:
	addons/crm/crm_case_section_view.xml

diff --cc addons/crm/crm_lead_view.xml
index 8264f46,995a1dd..a8f58fd
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -570,12 -568,12 +568,12 @@@
                              help="Opportunities that are assigned to me"/>
                      <filter string="My Team(s)"
                              domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                             help="Opportunities that are assigned to any sales teams I am member of"/>
+                             help="Opportunities that are assigned to any sales teams I am member of" groups="base.group_multi_salesteams"/>
                      <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                      <separator/>
 -                    <group expand="0" string="Group By..." colspan="16">
 +                    <group expand="0" string="Group By" colspan="16">
                          <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                         <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                         <filter string="Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                          <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                          <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                          <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>

diff --cc addons/crm/report/crm_lead_report_view.xml
index 0874835,239579a..bbe375f
--- 1/addons/crm/report/crm_lead_report_view.xml
--- 2/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@@ -79,9 -79,9 +79,9 @@@
                          <field name="opening_date"/>
                          <field name="date_closed"/>
                      </group>
 -                    <group expand="1" string="Group By...">
 +                    <group expand="1" string="Group By">
                          <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}" />
-                         <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" />
+                         <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                          <filter string="Partner" context="{'group_by':'partner_id'}" />
                          <filter string="Country" context="{'group_by':'country_id'}" />
                          <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

diff --cc addons/crm/report/crm_phonecall_report_view.xml
index 9b097d2,98f4a58..41af35d
--- 1/addons/crm/report/crm_phonecall_report_view.xml
--- 2/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@@ -45,9 -45,9 +45,9 @@@
                          <field name="opening_date"/>
                          <field name="date_closed"/>
                      </group>
 -                    <group expand="1" string="Group By...">
 +                    <group expand="1" string="Group By">
                          <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                         <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                         <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                          <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                          <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                          <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />

diff --cc addons/crm_claim/report/crm_claim_report_view.xml
index bdae622,2068ed8..bc9293e
--- 1/addons/crm_claim/report/crm_claim_report_view.xml
--- 2/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@@ -44,9 -44,9 +44,9 @@@
                          <field name="date_closed" />
                          <field name="date_deadline" />
                      </group>
 -                    <group  expand="1" string="Group By...">
 +                    <group  expand="1" string="Group By">
                          <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                         <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"  groups="base.group_multi_salesteams"/>
+                         <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                          <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                          <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                          <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />

diff --cc addons/crm_partner_assign/report/crm_lead_report_view.xml
Simple merge

diff --cc addons/crm_partner_assign/report/crm_partner_report_view.xml
Simple merge

diff --cc addons/document/document_view.xml
Simple merge

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

diff --cc addons/mail/mail_message_view.xml
Simple merge

diff --cc addons/project_issue/report/project_issue_report_view.xml
index b7c9fc7,b0e24d7..0a9c044
--- 1/addons/project_issue/report/project_issue_report_view.xml
--- 2/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@@ -28,10 -28,10 +28,10 @@@
                      <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
                      <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"
                              help="Tasks beloging to a folded stage"/>
 -                    <group  expand="1" string="Group By...">
 +                    <group  expand="1" string="Group By">
                          <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                          <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                         <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                         <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                          <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                          <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                          <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>

diff --cc addons/sale/report/sale_report_view.xml
index 2fc0388,0549867..6569535
--- 1/addons/sale/report/sale_report_view.xml
--- 2/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@@ -32,8 -32,9 +32,9 @@@
                      <field name="categ_id"/>
                      <field name="company_id" groups="base.group_multi_company"/>
                  </group>
 -                <group expand="1" string="Group By...">
 +                <group expand="1" string="Group By">
                      <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                     <filter string="Sales Team" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                      <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                      <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                      <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>

diff --cc addons/sale/sale_view.xml
index 8761ecb,25163d9..d2eeed8
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -255,8 -256,9 +256,9 @@@
                      <filter string="My" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                      <field name="partner_id" operator="child_of"/>
                      <field name="user_id"/>
+                     <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                      <field name="project_id"/>
 -                    <group expand="0" string="Group By...">
 +                    <group expand="0" string="Group By">
                          <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                          <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                          <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

diff --cc addons/website_blog/views/website_blog_views.xml
Simple merge

diff --cc addons/website_event_track/views/event_backend.xml
Simple merge

diff --cc addons/website_forum/views/forum.xml
Simple merge