[IMP] hr_payroll: committing view changes which got reverted

bzr revid: mtr@mtr-20110330063927-25p27rwvklr12ge8

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8fbfe62..cc0d787 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -636,18 +636,16 @@
                 <notebook colspan="6">
                     <page string="General">
                         <group col="6" colspan="6">
-                            <group col="2" colspan="4">
-                                <separator colspan="4" string="Computational Expression"/>
-                                <field name="computational_expression" colspan="4" nolabel="1"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Calculations"/>
                                 <!--<field name="type"/>-->
+                                <field name="computational_expression"/>
                                 <field name="condition_select"/>
                                 <field name="conditions" attrs="{'invisible':[('condition_select','=','range')]}"/>
                                 <field name="condition_range_min" attrs="{'invisible':[('condition_select','=','python')]}" colspan="1"/>
                                 <field name="condition_range_max" attrs="{'invisible':[('condition_select','=','python')]}" colspan="1"/>
                                 <field name="amount_type"/>
+                                <field name="expression_result"/>
                                 <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'invisible':[('amount_type','=','code')]}"/>
                                 <group col="2" colspan="2"  attrs="{'invisible':[('amount_type','&lt;&gt;','code')]}">
                                     <separator colspan="2" string="Compute Code"/>
@@ -659,10 +657,10 @@
                                 <separator colspan="4" string="Company contribution"/>
                                     <field name="company_contribution"/>
                                     <group col="2" colspan="2" attrs="{'readonly':[('company_contribution','=',False)]}">
-                                        <field name="amt_type" />
-                                        <field name="contribute_per"/>
+                                       <!-- <field name="amt_type" />
+                                        <field name="contribute_per"/>-->
                                         <field name="register_id"/>
-                                        <field name="company_contrib"/>
+                                     <!--   <field name="company_contrib"/>-->
                                     </group>
                                 </group>
                            </group>