From a961da825b0a2d17502cf2dfddf509c30a4f0b5b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 29 Aug 2008 01:48:43 +0200
Subject: [PATCH] Improved Views

bzr revid: fp@tinyerp.com-20080828234843-qnvgouc0hxmmyhh0
---
 addons/hr/hr_view.xml        | 31 ++++++++++++++++---------------
 addons/hr/report/__init__.py |  1 -
 addons/purchase/purchase.py  |  5 ++---
 addons/stock/stock_view.xml  |  7 +++----
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c13e7cd9eac..734fb2298aa 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -93,17 +93,18 @@
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
         </record>
         <menuitem
-			action="open_view_employee_list"
-			groups="base.group_admin"
-			id="menu_open_view_employee_list"
-			parent="hr.menu_hr_root"/>
+            action="open_view_employee_list"
+            groups="base.group_admin"
+            id="menu_open_view_employee_list"
+            parent="hr.menu_hr_root"/>
         <menuitem
-			action="open_view_employee_tree"
-			groups="base.group_admin"
-			id="menu_open_view_employee_tree"
-			parent="menu_open_view_employee_list"/>
+            action="open_view_employee_tree"
+            groups="base.group_admin"
+            id="menu_open_view_employee_tree"
+            parent="menu_open_view_employee_list"/>
 
        <record id="open_view_employee_list_my" model="ir.actions.act_window">
             <field name="name">My Employees</field>
@@ -113,9 +114,9 @@
             <field name="domain">[('parent_id.user_id','=',uid)]</field>
         </record>
         <menuitem
-			action="open_view_employee_list_my"
-			id="menu_open_view_employee_list_my"
-			parent="menu_open_view_employee_list"/>
+            action="open_view_employee_list_my"
+            id="menu_open_view_employee_list_my"
+            parent="menu_open_view_employee_list"/>
 
         <record id="open_view_employee_new" model="ir.actions.act_window">
             <field name="name">New Employee</field>
@@ -124,10 +125,10 @@
             <field name="view_mode">form,tree</field>
         </record>
         <menuitem
-			action="open_view_employee_new"
-			groups="base.group_admin"
-			id="menu_open_view_employee_new" 
-			parent="menu_open_view_employee_list"/>
+            action="open_view_employee_new"
+            groups="base.group_admin"
+            id="menu_open_view_employee_new" 
+            parent="menu_open_view_employee_list"/>
 
         <!--
         =======================
diff --git a/addons/hr/report/__init__.py b/addons/hr/report/__init__.py
index 26cdf1dee08..b3d4f8263fe 100644
--- a/addons/hr/report/__init__.py
+++ b/addons/hr/report/__init__.py
@@ -28,7 +28,6 @@
 #
 ##############################################################################
 
-import timesheet
 import bymonth
 import attendance_errors
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6d68ccdf665..367a95dddb0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -90,10 +90,9 @@ class purchase_order(osv.osv):
         res = {}
         for purchase in self.browse(cursor, user, ids, context=context):
             tot = 0.0
-
-            if purchase.invoice_id.state not in ('draft','cancel'):
+            if purchase.invoice_id and purchase.invoice_id.state not in ('draft','cancel'):
                 tot += purchase.invoice_id.amount_untaxed
-            if tot:
+            if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:
                 res[purchase.id] = 0.0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0cb6e17ace4..d1ae72353f9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -783,7 +783,7 @@
         </record>
         
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Sending Goods</field>
+            <field name="name">Sending Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -852,7 +852,7 @@
         <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree"/>
         
         #
-        # Reception of Goods
+        # Reception of Products
         #
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
@@ -946,7 +946,7 @@
         
         
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Getting Goods</field>
+            <field name="name">Getting Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -998,7 +998,6 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="view_picking_in_form"/>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="domain">[('type','=','in')]</field>
         </record>