merge

bzr revid: fp@tinyerp.com-20080903142214-jcv5hg4l20wofr6e

addons/account/account.py

@@ -356,9 +356,9 @@ class account_account(osv.osv):
                 child_ids=self.copy(cr, uid, child.id, default, context=context,done_list=done_list)
                 if child_ids:
                     new_child_ids.append(child_ids)
-            default['child_id'] = [(6, 0, new_child_ids)]
+            default['child_parent_ids'] = [(6, 0, new_child_ids)]
         else:
-            default['child_id'] = False
+            default['child_parent_ids'] = False
         return super(account_account, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1899,7 +1899,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             #recording the new tax code to do the mapping
             tax_code_template_ref[tax_code_template.id] = new_tax_code
 
-        #create all the tax 
+        #create all the tax
         for tax in obj_multi.chart_template_id.tax_template_ids:
             #create it
             vals_tax = {

addons/account/account_view.xml

@@ -169,7 +169,7 @@
             <field name="res_model">account.account</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_tree"/>
-            <field name="domain">[('code','=','0')]</field>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
 

addons/product/product.py

@@ -422,7 +422,7 @@ class product_product(osv.osv):
         'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
     }
 
-    def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):        
+    def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
         if uom_id and uom_po_id:
             uom_obj=self.pool.get('product.uom')
             uom=uom_obj.browse(cursor,user,[uom_id])[0]

addons/project/project.py

@@ -220,10 +220,13 @@ class task(osv.osv):
     def _progress_rate(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for task in self.browse(cursor, user, ids, context=context):
-            tot = 0.0
-            if task.state not in ('draft','cancelled'):
-                tot += task.effective_hours * 100.0 / task.planned_hours
-            res[task.id] = tot
+            if task.state in ('cancelled','done'):
+                res[task.id] = 100.0
+            else:
+                if task.planned_hours:
+                    res[task.id] = task.effective_hours * 100.0 / task.planned_hours
+                else:
+                    res[task.id] = 0.0
         return res
 
     _columns = {