[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com...

bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3

diff --cc addons/account/account.py
Simple merge

diff --cc addons/account/account_invoice_view.xml
index 940ac54,947aad4..bd586cd
--- 1/addons/account/account_invoice_view.xml
--- 2/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@@ -457,14 -456,12 +457,14 @@@
                      <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                      <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                      <separator/>
-                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
 -                    <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                     <field name="partner_id" operator="child_of"/>
                      <field name="user_id" string="Salesperson"/>
                      <field name="period_id" string="Period"/>
 +                    <separator/>
 +                    <filter domain="[('user_id','=',uid)]" help="My Invoices"/>
                      <group expand="0" string="Group By...">
 -                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
 +                      <filter name="group_by_partner_id" string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
 +                      <filter name="commercial_partner_id" string="Commercial Partner" domain="[]" context="{'group_by':'commercial_partner_id'}"/>
                          <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                          <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                          <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>

diff --cc addons/account/account_move_line.py
Simple merge

diff --cc addons/account/project/project_view.xml
Simple merge

diff --cc addons/account_analytic_plans/account_analytic_plans.py
Simple merge

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/crm/crm_lead_view.xml
index 0985914,e0311d1..6b23be6
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -325,9 -326,9 +325,9 @@@
                  <search string="Search Leads">
                      <field name="name" string="Lead / Customer" filter_domain="['|','|','|',('partner_name','ilike',self),('email_from','ilike',self),('contact_name','ilike',self),('name','ilike',self)]"/>
                      <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
 -                    <field name="section_id" context="{'invisible_section': False}"/>
 +                    <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                      <field name="user_id"/>
-                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                     <field name="partner_id" operator="child_of"/>
                      <field name="create_date"/>
                      <field name="country_id" context="{'invisible_country': False}"/>
                      <separator/>
@@@ -544,25 -544,22 +544,25 @@@
                  <search string="Search Opportunities">
                      <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                      <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
 -                    <field name="section_id" context="{'invisible_section': False}"/>
 +                    <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                      <field name="user_id"/>
-                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                     <field name="partner_id" operator="child_of"/>
 +                    <field name="stage_id" domain="[]"/>
 +                    <field name="probability"/>
                      <separator/>
 -                    <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
 -                    <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
 -                    <filter string="Won" name="won" domain="[('state','=','done')]"/>
 -                    <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
 -                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
 -                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
 -                    <filter string="Assigned to Me"
 -                            domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
 +                    <filter string="Won" name="won"
 +                            domain="[('probability', '=', 100), ('stage_id.fold', '=', True)]"/>
 +                    <filter string="Lost" name="lost"
 +                            domain="[('probability', '=', 0), ('stage_id.fold', '=', True)]"/>
 +                    <filter string="Unassigned" name="unassigned"
 +                            domain="[('user_id','=', False)]" help="No salesperson"/>
 +                    <filter string="My Opportunities" name="assigned_to_me"
 +                            domain="[('user_id', '=', uid)]" context="{'invisible_section': False}"
                              help="Opportunities that are assigned to me"/>
 -                    <filter string="Assigned to My Team(s)"
 +                    <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"/>
 +                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                      <separator/>
                      <group expand="0" string="Group By..." colspan="16">
                          <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>

diff --cc addons/crm/crm_phonecall_view.xml
index 60b5934,21e18d8..b71eee4
--- 1/addons/crm/crm_phonecall_view.xml
--- 2/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@@ -176,10 -186,9 +176,10 @@@
                 <separator/>
                 <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                         help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
-                <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                <field name="partner_id" operator="child_of"/>
                 <field name="user_id"/>
 -               <field name="section_id" string="Sales Team"/>
 +               <field name="section_id" string="Sales Team"
 +                        groups="base.group_multi_salesteams"/>
                 <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

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

diff --cc addons/project_issue/project_issue_view.xml
index 68c6712,494f054..e420241
--- 1/addons/project_issue/project_issue_view.xml
--- 2/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@@ -140,14 -139,14 +140,14 @@@
              <field name="model">project.issue</field>
              <field name="arch" type="xml">
                  <search string="Issue Tracker Search">
 -                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','child_of',self),('email_from','ilike',self),('name','ilike',self)]"/>
 +                    <field name="name" string="Issue" filter_domain="['|', '|', '|', ('partner_id','child_of',self), ('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                      <field name="id"/>
-                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
 -                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
++                    <field name="partner_id" operator="child_of"/>
 +                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
 +                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                      <separator/>
 -                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
 -                    <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
 +                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                      <separator/>
 -                    <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-"/>
                      <field name="user_id"/>
                      <field name="project_id"/>
                      <field name="categ_ids"/>

diff --cc addons/purchase/purchase_view.xml
Simple merge

diff --cc addons/sale/sale_demo.xml
Simple merge

diff --cc addons/sale/sale_view.xml
index 7e6d84a,16e9e2a..30a644e
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -252,8 -306,8 +252,8 @@@
                      <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                      <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                      <separator/>
 -                    <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
 +                    <filter string="My" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                     <field name="partner_id" operator="child_of"/>
                      <field name="user_id"/>
                      <field name="project_id"/>
                      <group expand="0" string="Group By...">

diff --cc addons/sale_stock/sale_stock_demo.xml
Simple merge

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/stock/wizard/stock_location_product.py
Simple merge