[MERGE]

bzr revid: mra@tinyerp.com-20100602094557-ohvx7l6106ncda9v

addons/document_ftp/ftpserver/ftpserver.py

@@ -1975,7 +1975,7 @@ class FTPHandler(asynchat.async_chat):
         # which IPv6 address to use for binding the socket?
         # Unfortunately RFC-2428 does not provide satisfing information
         # on how to do that.  The assumption is that we don't have any way
-        # to know wich address to use, hence we just use the same address
+        # to know which address to use, hence we just use the same address
         # family used on the control connection.
         if not line:
             self._make_epasv(extmode=True)

addons/mrp_procurement/mrp_procurement.py

@@ -200,7 +200,7 @@ class mrp_procurement(osv.osv):
         return False
 
     #
-    # Return the quantity of product shipped/produced/served, wich may be
+    # Return the quantity of product shipped/produced/served, which may be
     # different from the planned quantity
     #
     def quantity_get(self, cr, uid, id, context={}):

addons/product/pricelist_view.xml

@@ -97,6 +97,21 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="product_pricelist_view_search">
+            <field name="name">product.pricelist.search</field>
+            <field name="model">product.pricelist</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Products Price Search">
+                    <field name="name" />
+                    <field name="type"/>
+                    <field name="currency_id"/>
+                    <field name="active" />
+                </search>
+            </field>
+        </record>
+        
+
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
@@ -145,6 +160,7 @@
             <field name="res_model">product.pricelist</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="product_pricelist_view_search" />
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"

addons/project/project_view.xml

@@ -123,6 +123,7 @@
                        <field name="user_id" string="Project Manager" default="1"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
+                   <newline />
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>

addons/resource/resource.py

@@ -35,7 +35,7 @@ class resource_calendar(osv.osv):
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
     _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=c)
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context)
     }
 
     def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):

addons/resource/resource_view.xml

@@ -56,8 +56,8 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <!--<filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>-->
+                        <filter string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>
@@ -178,11 +178,11 @@
             <field name="arch" type="xml">
                 <tree string="Resources">
                     <field name="name" />
+                    <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
                     <field name="calendar_id" />
                     <field name="time_efficiency" groups="base.group_extended"/>
-                    <field name="user_id" />
                 </tree>
             </field>
         </record>