!10417 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !10417 from 李鹏宇/dev_wang
This commit is contained in:
@@ -9,18 +9,14 @@ class ReceivableModifyFilterDomains(models.Model):
|
||||
@api.model
|
||||
def get_receivable_filter_domains(self, params):
|
||||
"""根据当前筛选条件,返回物业/承租方/合同的候选 ID 集合,用于三个下拉框互相过滤。"""
|
||||
# 注意:这里不按日期限制,只根据当前组合条件(公司/权属/片区/收款类型/物业/承租方/合同)
|
||||
# 来计算三类对象的全集,避免不同报表各自的日期口径导致候选集为空。
|
||||
domain = [
|
||||
('receivable_id.is_invalid', '=', False),
|
||||
]
|
||||
|
||||
date_start = params.get("date_start")
|
||||
date_end = params.get("date_end")
|
||||
if date_start:
|
||||
domain.append(('receivable_id.due_date', '>=', datetime.datetime.fromisoformat(date_start).date()))
|
||||
if date_end:
|
||||
domain.append(('receivable_id.due_date', '<=', datetime.datetime.fromisoformat(date_end).date()))
|
||||
|
||||
keyword = params.get("keyword")
|
||||
|
||||
if keyword:
|
||||
domain += [
|
||||
'|', '|',
|
||||
|
||||
Reference in New Issue
Block a user