报表

yuthon_report/models/month_receivable_report.py

@@ -19,7 +19,6 @@ class MonthReceivableReport(models.Model):
         domain = [
             ('receivable_id.is_invalid', '=', False),
             ('receivable_id.submitted', '>', 0),
-            ('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']),
         ]
 
         # 单月日期选择器传 date_start
@@ -49,6 +48,8 @@ class MonthReceivableReport(models.Model):
             domain.append(('receivable_id.company_id', '=', company_id))
         if management_type_id:
             domain.append(('receivable_id.management_type_id', '=', management_type_id))
+        else:
+            domain.append(('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']))
 
         lines = self.search(domain, order='receivable_id asc')
 

yuthon_report/models/pre_advance_report.py

@@ -33,7 +33,6 @@ class PreAdvanceReport(models.Model):
             ('receivable_id.submitted', '=', 0),
             ('original_amount', '>', 0),
             ('receivable_id.is_invalid', '=', False),
-            ('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']),
         ]
 
         keyword = params.get("keyword")
@@ -58,6 +57,8 @@ class PreAdvanceReport(models.Model):
             domain.append(('receivable_id.company_id', '=', company_id))
         if management_type_id:
             domain.append(('receivable_id.management_type_id', '=', management_type_id))
+        else:
+            domain.append(('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']))
 
         lines = self.search(domain, order="receivable_id asc")
 

yuthon_report/models/pre_arrears_report.py

@@ -27,7 +27,6 @@ class PreArrearsReport(models.Model):
             ('receivable_id.due_date', '<', cutoff_date),
             ('receivable_id.submitted', '>', 0),
             ('receivable_id.is_invalid', '=', False),
-            ('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']),
         ]
 
         keyword = params.get("keyword")
@@ -52,6 +51,8 @@ class PreArrearsReport(models.Model):
             domain.append(('receivable_id.company_id', '=', company_id))
         if management_type_id:
             domain.append(('receivable_id.management_type_id', '=', management_type_id))
+        else:
+            domain.append(('receivable_id.management_type_id.name', 'not in', ['押金', '违约金']))
 
         lines = self.search(domain, order="receivable_id asc")