merge

bzr revid: fp@tinyerp.com-20100219171600-w59td9msausdwloz

addons/hr/hr_department.py

@@ -163,14 +163,7 @@ class res_users(osv.osv):
     _columns = {
         'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
         'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search,method=True, string="Subordinates", type='many2many'),
+        'context_department_id': fields.many2one('hr.department', 'Departments'),
     }
 res_users()
-
-#class users(osv.osv):
-#    _inherit = 'res.users'
-#    _description = "Users"
-#    _columns = {
-#        'context_department_id': fields.many2one('hr.department', 'Departments'),
-#    }
-#users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr/hr_department_view.xml

@@ -83,6 +83,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Departements Informations">
+                        <field name="context_department_id" completion="1" widget="selection" string="Department"/>
                         <separator string="Managers" colspan="4"/>
                         <field name="parent_id" nolabel="1" colspan="4"/>
                         <separator string="Subordinates" colspan="4"/>
@@ -91,7 +92,7 @@
                 </notebook>
             </field>
         </record>
-		<!--<record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
+		<record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
             <field name="name">view.department.form.hr.inherited1</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form_simple_modif" />
@@ -102,18 +103,5 @@
                 </page>
             </field>
         </record>
-
-        <record id="view_department_form_simple_modif_inherited2" model="ir.ui.view">
-                <field name="name">view.department.form.hr.inherited2</field>
-                <field name="model">res.users</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base.view_users_form"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="password" position="after">
-                    <field name="context_department_id" completion="1" widget="selection"/>
-                    </field>
-                </field>
-        </record>
-    --></data>
+        </data>
 </openerp>

addons/sale/sale.py

@@ -981,8 +981,7 @@ class sale_order_line(osv.osv):
                 if product_obj.uos_id.category_id.id != uos2.category_id.id:
                     uos = False
             else:
-                uos = False
-        result.update({'type': product_obj.procure_method})
+                uos = False        
         if product_obj.description_sale:
             result['notes'] = product_obj.description_sale
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
@@ -990,6 +989,8 @@ class sale_order_line(osv.osv):
             result['delay'] = (product_obj.sale_delay or 0.0)
             partner = partner_obj.browse(cr, uid, partner_id)
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            result.update({'type': product_obj.procure_method})
+
         if not flag:
             result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
         domain = {}

addons/stock/stock_view.xml

@@ -389,6 +389,7 @@
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
             <field name="type">tree</field>
+            <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
                     <field name="complete_name"/>