audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #466 into 12.0

Browse Source 
Signed-off-by sbejaoui
This commit is contained in:
OCA-git-bot
2020-03-17 18:12:33 +00:00
parent d7caae979d 590ea6fd9b
commit eb279d3b5a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract/views/contract.xml
View File

@@ -212,7 +212,7 @@
<separator/>
<filter name="not_finished"
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"
string="Finished"

2
contract/views/res_partner_view.xml
View File

@@ -34,7 +34,7 @@
<filter
name="filter_running_contract"
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>
</field>