From 581ae0530d66b71721d66237a9ce260a101ab6f1 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 17 Jul 2008 12:06:07 +0200
Subject: [PATCH] *removed revison number 1457 *applied revision after 1457

	1459. By  Fabien Pinckaers:  Better Expense View
	1458. By  Fabien Pinckaers:   Better BoM view

bzr revid: qdp@tinyerp.com-20080717100607-vfmwnlkd530419rz
---
 addons/hr_expense/hr_expense_view.xml |  6 ++--
 addons/mrp/mrp_view.xml               | 40 ++++++++++++---------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 8f28adb1929..eda15334250 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -52,10 +52,10 @@
                             <field name="currency_id"/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
-                                    <field name="name" select="1"/>
-                                    <field name="date_value" select="1"/>
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
                                     <field name="uom_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
+                                    <field name="name" select="1"/>
+                                    <field name="date_value" select="1"/>
                                     <field name="unit_quantity" select="2"/>
                                     <field name="unit_amount" select="2"/>
                                     <field name="ref" select="2"/>
@@ -158,4 +158,4 @@
         <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b751992a542..4af03bca6ca 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,8 +5,8 @@
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Production Management"/>
         
         <!--
-	Property / Property Group
-	-->
+    Property / Property Group
+    -->
         
         <record id="mrp_property_group_form_view" model="ir.ui.view">
             <field name="name">mrp.property.group.form</field>
@@ -68,8 +68,8 @@
         <menuitem action="mrp_property_action" id="menu_mrp_property_action" parent="menu_mrp_property_group_action_prop"/>
         
         <!--
-	Workcenters
-	-->
+    Workcenters
+    -->
         
         <record id="mrp_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.workcenter.tree</field>
@@ -131,8 +131,8 @@
         <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration"/>
         
         <!--
-	Routings
-	-->
+    Routings
+    -->
         
         <record id="mrp_routing_workcenter_tree.view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.tree</field>
@@ -205,8 +205,8 @@
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/>
         
         <!--
-	Bill of Materials
-	-->
+    Bill of Materials
+    -->
         
         <record id="mrp_bom_form_view" model="ir.ui.view">
             <field name="name">mrp.bom.form</field>
@@ -216,10 +216,10 @@
                 <form string="Bill of Material">
                     <notebook>
                         <page string="General Information">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
                             <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
                             <newline/>
+                            <field name="name" select="1"/>
+                            <field name="code" select="1"/>
                             <field name="product_uom"/>
                             <field name="product_qty"/>
                             <newline/>
@@ -340,8 +340,8 @@
         </record>
         
         <!--
-	Production Management
-	-->
+    Production Management
+    -->
         
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
@@ -391,9 +391,9 @@
                             <field name="product_qty"/>
                             <field name="product_uom"/>
                             <!--
-					<field name="product_uos_qty"/>
-					<field name="product_uos"/>
-					-->
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
+                    -->
                             <field name="bom_id" select="2"/>
                             
                             <newline/>
@@ -564,8 +564,8 @@
         </record>
         
         <!--
-	Procurement
-	-->
+    Procurement
+    -->
         
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
             <field name="name">mrp.procurement.tree</field>
@@ -693,9 +693,6 @@
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>
                     <field name="product_max_qty"/>
-                    <!--
-				<field name="logic"/>
--->
                 </tree>
             </field>
         </record>
@@ -708,9 +705,6 @@
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
                     <field name="warehouse_id" select="1"/>
-                    <!--
-				<field name="logic"/>
--->
                     <field name="product_id" on_change="onchange_product_id(product_id)" select="1"/>
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>