Merge lp:~openerp-dev/openobject-addons/trunk-bug-909167-bde into lp:openobject-addons

Proposed by Bharat Devnani (Open ERP)
Status: Merged
Merged at revision: 6181
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-909167-bde
Merge into: lp:openobject-addons
Diff against target: 13 lines (+2/-1)
1 file modified
hr_timesheet_invoice/hr_timesheet_invoice_view.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-909167-bde
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+87003@code.launchpad.net

Description of the change

Hello Sir,

I have applied the patch given Ferdinand @ Camptocamp
in order to fix the bug.

Thanks & Regards,
Devnani Bharat R.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2011-11-16 14:59:58 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2011-12-28 10:52:25 +0000
@@ -89,7 +89,8 @@
89 <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>89 <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
90 <field name="arch" type="xml">90 <field name="arch" type="xml">
91 <field name="date" position="before">91 <field name="date" position="before">
92 <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>92 <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
93 <filter name="invoiced" string="Invoiced" context="{'to_invoice': 1}" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
93 <separator orientation="vertical"/>94 <separator orientation="vertical"/>
94 </field>95 </field>
95 </field>96 </field>

Subscribers

People subscribed via source and target branches

to all changes: