[MERGE]

bzr revid: uco@tinyerp.com-20100520052027-e1u7fbjlzx4h396e

diff --cc addons/crm/crm_lead_menu.xml
index d4d182a,ce29a20..82561f3
--- 1/addons/crm/crm_lead_menu.xml
--- 2/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@@ -8,8 -8,9 +8,8 @@@
          <field name="view_mode">tree,form</field>
          <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
          <field name="view_id" ref="crm_case_tree_view_leads"/>
+         <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
          <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
--        <field name="context">{'search_default_current':1}</field>
      </record>
  
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">

diff --cc addons/crm/crm_lead_view.xml
index aaca747,886492a..3441c00
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -47,8 -47,9 +47,9 @@@
                           name="convert_opportunity"
                           string="Convert"
                           help="Convert to Opportunity"
--                         icon="gtk-index"   
-                          type="object"/>
++                         icon="gtk-index"
+                          type="object"
+                          attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                      <newline />
                      <field name="section_id" colspan="1"
                          widget="selection" />

diff --cc addons/crm/crm_meeting_menu.xml
index 3f8e1bd,064f556..1a47043
--- 1/addons/crm/crm_meeting_menu.xml
--- 2/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@@ -50,7 -50,7 +50,7 @@@
          <field name="res_model">crm.meeting</field>
          <field name="view_mode">calendar,tree,form,gantt</field>
          <field name="view_id" ref="crm_case_calendar_view_meet"/>
-         <field name="context">{'search_default_current':1}</field>
 -        <field name="context">{"search_default_user_id":uid}</field>
++        <field name="context">{'search_default_current':1,"search_default_user_id":uid}</field>
          <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
      </record>
  

diff --cc addons/crm/crm_meeting_view.xml
index 6712ffe,0a78100..e7eb1d0
--- 1/addons/crm/crm_meeting_view.xml
--- 2/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@@ -269,12 -266,11 +266,11 @@@
                             <separator orientation="vertical"/>
                             <field name="name" select="1" string="Subject"/>
                             <field name="partner_id" select="1" />
-                            <field name="section_id"
-                                select="1" widget="selection">
-                                <filter icon="terp-crm"
-                                    domain="[('section_id','=',context.get('section_id',False))]"
-                                    help="My section" />
-                            </field>
+                            <field name="section_id" select="1" widget="selection">
 -                               <filter icon="terp-crm"
 -                                   domain="[('section_id','=',context.get('section_id',False))]"
 -                                   help="My Sale Team" />
 -                           </field>
++                           <filter icon="terp-crm"
++                               domain="[('section_id','=',context.get('section_id',False))]"
++                               help="My section" />
++                                 </field>
                             <field name="user_id" select="1" widget="selection"/>
                         </group>
                         <newline/>

diff --cc addons/crm/crm_opportunity_view.xml
index 7594eb0,2bc711c..2c23a6c
--- 1/addons/crm/crm_opportunity_view.xml
--- 2/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@@ -301,10 -298,10 +297,10 @@@
                  <field name="section_id"
                      default="context.get('section_id', False)" select="1"
                      widget="selection">
--                    <filter icon="terp-crm"
--                        domain="[('section_id','=',context.get('section_id',False))]"
-                         help="My section" />
-                 </field>
 -                        help="My Sale Team" />
 -                </field>
++                      <filter icon="terp-crm"
++                              domain="[('section_id','=',context.get('section_id',False))]"
++                              help="My section" />
++                      </field>
                  <newline/>
                  <group expand="0" string="Group By..." colspan="16">
                      <filter string="Stage" icon="terp-crm" domain="[]"

diff --cc addons/crm/crm_phonecall_view.xml
index 3bfa284,a72a8df..2a06068
--- 1/addons/crm/crm_phonecall_view.xml
--- 2/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@@ -272,10 -269,10 +269,10 @@@
                 </field>
                 <field name="section_id"
                     select="1" widget="selection" string="Sales Team">
--                   <filter icon="terp-crm"
--                       domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section" />
-                </field>
 -                       help="My Sale Team" />
 -               </field>
++                                      <filter icon="terp-crm"
++                        domain="[('section_id','=',context.get('section_id',False))]"
++                        help="My section" />
++                </field>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="4">
                     <filter string="Partner" icon="terp-crm" domain="[]"

diff --cc addons/crm/crm_view.xml
Simple merge

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

diff --cc addons/project/report/project_report_view.xml
index a4a0728,9cca4f5..97e3d61
--- 1/addons/project/report/project_report_view.xml
--- 2/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@@ -88,11 -84,11 +84,11 @@@
                                                help="Non Assigned Tasks to users"
                                                domain="[('user_id','=',False)]"/>
                            </field>
-                           <field name="project_id">
-                               <filter icon="terp-project"
-                                               string="My Task"
-                                               help="My Tasks"
-                                               domain="[('project_id','=',context.get('project_id', False)]"/>
+                           <field name="project_id" widget="selection">
+                               <filter icon="terp-project"
 -                                              string="My Task"
 -                                              help="My Tasks"
 -                                              domain="[('project_id','=',context.get('project_id', False)]"/>
++-                                             string="My Task"
++-                                             help="My Tasks"
++-                                             domain="[('project_id','=',context.get('project_id', False)]"/>
                                <filter icon="terp-project"
                                                string="Non assigned tasks to projects"
                                                help ="Non assigned tasks to projects"

diff --cc addons/project_issue/project_issue_menu.xml
index 9a4bb52,9a4bb52..7179090
--- 1/addons/project_issue/project_issue_menu.xml
--- 2/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@@ -14,7 -14,7 +14,7 @@@
          <field name="view_mode">tree,calendar</field>
          <field name="view_id" ref="project_issue_tree_view"/>
          <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
--        <field name="context">{"search_default_user_id": uid, "search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
++        <field name="context">{"search_default_user_id":uid,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
          <field name="search_view_id" ref="view_project_issue_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">

diff --cc addons/project_issue/report/project_issue_report_view.xml
index a9f8f01,5729698..31989be
--- 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
@@@ -93,10 -93,7 +93,8 @@@
                          domain="[('section_id.user_id.company_id','=',uid)]"
                          help="My company"/>
                          </field>
 +
-                               <field name="user_id"  select="1" widget="selection">
-                                       <filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" domain="[('user_id','=',uid)]" />
-                                       </field>
+                               <field name="user_id"  select="1" widget="selection"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Extended options..." colspan="10" col="12">

diff --cc addons/project_long_term/project_long_term_view.xml
index fafc2a1,fafc2a1..1382b13
--- 1/addons/project_long_term/project_long_term_view.xml
--- 2/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@@ -223,7 -223,7 +223,7 @@@
              <field name="res_model">project.phase</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form,calendar,gantt</field>
--                      <field name="context">{'search_default_responsible_id':uid}</field>
++            <field name="context">{"search_default_responsible_id":uid}</field>
              <field name="search_view_id" ref="view_project_phase_search"/>
          </record>
  

diff --cc addons/purchase/purchase_view.xml
index 5aac423,8f76d4b..6f3ce86
--- 1/addons/purchase/purchase_view.xml
--- 2/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@@ -200,8 -198,9 +198,9 @@@
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">purchase.order</field>
              <field name="view_type">form</field>
-             <field name="context">{'search_default_draft': 1}</field>
+             <field name="context">{'search_default_draft': 1,'search_create_uid':uid}</field>
              <field name="view_mode">tree,form,graph,calendar</field>
 -            <field name="search_view_id" ref="view_purchase_order_filter"/>
++            <field name="search_view_id" ref="vview_purchase_order_filter"/>
          </record>
          <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
                  sequence="6"/>
@@@ -211,7 -210,8 +210,8 @@@
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">purchase.order</field>
              <field name="view_mode">tree,form,graph,calendar</field>
-             <field name="context">{'search_default_approved': 1}</field>
+             <field name="context">{'search_default_approved': 1,'search_create_uid':uid}</field>
 -            <field name="search_view_id" ref="view_purchase_order_filter"/>
++            <field name="search_view_id" ref="vview_purchase_order_filter"/>
          </record>
          <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
  

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

diff --cc addons/sale/wizard/sale_line_invoice.py
Simple merge

diff --cc addons/sale/wizard/sale_make_invoice_advance.py
index 6c9ca17,2861a04..2d5320d
--- 1/addons/sale/wizard/sale_make_invoice_advance.py
--- 2/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@@ -22,10 -22,6 +22,10 @@@ from osv import fields, os
  from service import web_services
  from tools.translate import _
  import ir
 +import netsvc
 +import pooler
- import wizard
++
 +
  
  class sale_advance_payment_inv(osv.osv_memory):
      _name = "sale.advance.payment.inv"

diff --cc addons/scrum/scrum_view.xml
index 379dc66,394ea4c..6485759
--- 1/addons/scrum/scrum_view.xml
--- 2/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@@ -298,7 -287,9 +289,8 @@@
              <field name="res_model">scrum.sprint</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
 -            <field name="context">{'search_default_filter_current': 1}</field>
              <field name="view_id" ref="view_scrum_sprint_tree"/>
+             <field name="context">{"search_default_scrum_master_id":uid}</field>
              <field name="search_view_id" ref="view_scrum_sprint_search"/>
          </record>
          <menuitem

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

diff --cc addons/stock/stock_view.xml
index 33b62bf,13ee27b..054c56e
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -649,8 -652,9 +652,9 @@@
                                              <field colspan="4" invisible="1" name="name"/>
                                              <field invisible="1" name="date"/>
                                              <field name="date_planned"/>
+                                                                                       <field name="date_expected" select="1" string="Date Expected"/>                                            
                                              <field name="address_id" context="{'contact_display':'partner'}"/>
 -                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
 +                                            <field groups="base.group_extended" name="product_packaging"/>
                                              <field name="prodlot_id" groups="base.group_extended"
                                                  context="{'location_id':location_id, 'product_id':product_id}"
                                                  domain="[('product_id','=?',product_id)]"
@@@ -799,7 -804,8 +804,8 @@@
                                              <field colspan="4" invisible="1" name="name"/>
                                              <field invisible="1" name="date"/>
                                              <field name="date_planned"/>
+                                                                                       <field name="date_expected"  string="Date Expected"/>                                            
 -                                            <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
 +                                            <field groups="base.group_extended" name="product_packaging"/>
                                              <field name="prodlot_id" groups="base.group_extended"
                                                  context="{'location_id':location_id, 'product_id':product_id}"
                                                  domain="[('product_id','=?',product_id)]"
@@@ -977,7 -984,8 +984,8 @@@
                                              <field colspan="4" invisible="1" name="name"/>
                                              <field invisible="1" name="date"/>
                                              <field name="date_planned"/>
+                                                                                       <field name="date_expected"  string="Date Expected"/>                                            
 -                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
 +                                            <field groups="base.group_extended" name="product_packaging"/>
                                              <field name="prodlot_id" groups="base.group_extended"
                                                  context="{'location_id':location_id, 'product_id':product_id}"
                                                  domain="[('product_id','=?',product_id)]"
@@@ -1151,9 -1159,10 +1159,10 @@@
                                              <field groups="product.group_uos" name="product_uos_qty"/>
                                              <field colspan="4" invisible="1" name="name" />
                                              <field groups="base.group_extended" name="date_planned"/>
+                                                                                       <field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
                                              <newline/>
                                              <newline/>
 -                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
 +                                            <field groups="base.group_extended" name="product_packaging"/>
                                              <newline/>
                                              <field name="prodlot_id" groups="base.group_extended"
                                                  context="{'location_id':location_id, 'product_id':product_id}"