Merge lp:~openerp-dev/openobject-addons/7.0-hrcontractfilters-jco into lp:openobject-addons/7.0

[Josse Colpaert (OpenERP)]

Add 2 filters for contract expiry

Unmerged revisions

8931. By Josse Colpaert (OpenERP) on 2013-03-26

[FIX] This will stop acting strangely when combining both filters

8930. By Josse Colpaert (OpenERP) on 2013-03-26

[IMP] Add 2 search filters for contract/visa expiry

=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml	2012-11-29 22:26:45 +0000
+++ hr_contract/hr_contract_view.xml	2013-03-26 15:56:22 +0000
@@ -56,11 +56,17 @@
                    <field name="date_end"/>
                    <field name="working_hours"/>
                    <field name="employee_id"/>
+                   <field name="visa_expire"/>
+                   <filter icon="terp-go-year" name = "contractend" string="Contract About To Renew (in 7 days)" 
+                            domain="['&amp;', ('date_end', '!=', False), ('date_end', '&lt;=', (context_today() + datetime.timedelta(7)).strftime('%%Y-%%m-%%d') )]"/>
+                   <filter icon="terp-go-year" name="expiryend" string="Visa About To Renew (in 60 days)" 
+                            domain="['&amp;', ('visa_expire', '!=', False), ('visa_expire', '&lt;=', (context_today() + datetime.timedelta(60)).strftime('%%Y-%%m-%%d') )]"/>
                    <group expand="0" string="Group By...">
                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                        <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                        <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                       
                    </group>
                </search>
             </field>