Merge PR #466 into 12.0

Signed-off-by sbejaoui
This commit is contained in:
OCA-git-bot
2020-03-17 18:12:33 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -212,7 +212,7 @@
<separator/> <separator/>
<filter name="not_finished" <filter name="not_finished"
string="In progress" string="In progress"
domain="['|', ('date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), ('date_end', '=', False)]" domain="['|', ('date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), '&amp;', ('date_end', '=', False), ('recurring_next_date', '!=', False)]"
/> />
<filter name="finished" <filter name="finished"
string="Finished" string="Finished"

View File

@@ -34,7 +34,7 @@
<filter <filter
name="filter_running_contract" name="filter_running_contract"
string="With running contracts" string="With running contracts"
domain="['|', ('contract_ids.date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), ('contract_ids.date_end', '=', False)]" domain="['|', ('contract_ids.date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), '&amp;', ('contract_ids.date_end', '=', False), ('contract_ids.recurring_next_date', '!=', False)]"
/> />
</filter> </filter>
</field> </field>