[MERGE] merged mtr's branch: payslip line color is blue when total is 0

bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b
This commit is contained in:
Quentin (OpenERP) 2011-04-28 14:26:05 +02:00
commit 6535ed21f6
1 changed files with 4 additions and 6 deletions

View File

@ -135,15 +135,13 @@
<field name="model">hr.payslip.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Salary Structure" editable="bottom">
<tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
<field name="category_id"/>
<field name="employee_id" invisible="1"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="amount_select"/>
<field name="amount_fix"/>
<field name="amount_percentage"/>
<field name="total"/>
</tree>
</field>
</record>
@ -242,7 +240,7 @@
<notebook colspan="4">
<page string="Salary Computation" >
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Salary Structure" editable="bottom">
<tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
<field name="name"/>
<field name="code"/>
<field name="category_id"/>
@ -280,7 +278,7 @@
<!-- TODO: put me back -->
<page string="Details By Salary Head">
<field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
<tree string="Payslip Lines">
<tree string="Payslip Lines" colors="blue:total == 0">
<field name="category_id"/>
<field name="name"/>
<field name="code"/>