[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101125100611-ke33q51zyw0f51we
This commit is contained in:
mtr
2010-11-25 15:36:11 +05:30
@@ -69,7 +69,7 @@
<filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
help = "Approved Expenses"/>
<separator orientation="vertical"/>
<filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
<filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
help = "Invoiced Expenses"/>
<separator orientation="vertical"/>
<field name="employee_id"/>