openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-clean-payslip_line-view-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  Mustufa Rangwala (Open ERP) (mra-tinyerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-clean-payslip_line-view-mtr/+merge/58957

hr_payroll:-
*improved payslip line view(removed fields that are used to calculate the total)
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-clean-payslip_line-view-mtr/+merge/58957
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-payroll.

=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml	2011-04-12 17:01:28 +0000
+++ hr_payroll/hr_payroll_view.xml	2011-04-25 13:19:29 +0000
@@ -250,30 +250,14 @@
                                     <field name="total"/>
                                 </tree>
                                 <form string="Payslip Line">
-                                    <group col="6" colspan="4">
-                                        <field name="name" colspan="4" select="1"/>
-                                        <field name="code" select="1"/>
-                                        <field name="appears_on_payslip"/>
-                                        <field name="salary_rule_id"/>
-                                    </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="4" string="Calculations"/>
-                                        <field name="category_id"/>
-                                        <field name="amount_select"/>
-                                        <field name="amount_fix" attrs="{'readonly':[('amount_select','&lt;&gt;','fix')]}"/>
-                                        <field name="amount_percentage" attrs="{'readonly':[('amount_select','=','percentage')]}"/>
-                                        <field name="sequence" groups="base.group_extended"/>
-                                    </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="4" string="Company contribution"/>
-                                        <field name="company_contrib"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Description">
-                                            <separator colspan="4" string="Description"/>
-                                            <field name="note" colspan="4" nolabel="1"/>
-                                        </page>
-                                    </notebook>
+                                    <group>
+	                                    <field name="name" select="1"/>
+	                                    <field name="code" select="1"/>
+	                                    <field name="category_id"/>
+	                                    <field name="sequence" groups="base.group_extended"/>
+	                                    <field name="total"/>
+	                                    <field name="company_id" groups="base.group_multi_company"/>
+                                    </group>
                                 </form>
                             </field>
                         </page>
@@ -291,7 +275,7 @@
 
                        <page string="Worked Days">
                             <field name="input_line_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree editable="bottom">
+                                <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
                                     <field name="number_of_days" sum="Total Working Days"/>