diff --git a/yuthon_property_approval/models/property_accounts_receivable_summary.py b/yuthon_property_approval/models/property_accounts_receivable_summary.py index 9adc1c88e..f081ef17a 100644 --- a/yuthon_property_approval/models/property_accounts_receivable_summary.py +++ b/yuthon_property_approval/models/property_accounts_receivable_summary.py @@ -23,12 +23,12 @@ class PropertyAccountsReceivableSummary(models.Model): electricity_unpaid = fields.Float(string='电费') penalty_unpaid = fields.Float(string='违约金') deposit_unpaid = fields.Float(string='押金') - ad_unpaid = fields.Float(string='广告灯箱费') + lightbox_unpaid = fields.Float(string='灯箱') other_unpaid = fields.Float(string='其他') - # 7 个单独展示的类型;其余类型(有偿服务收入/停车费/灯箱/管子间/更名费/维修费/其他费用/ - # 评估费/保险费,以及以后新增的类型)全部归入「其他」 - _SUMMARY_TYPES = ['租金', '管理费', '水费', '电费', '违约金', '押金', '广告灯箱费'] + # 7 个单独展示的类型(灯箱单独一列);其余类型(广告灯箱费/有偿服务收入/停车费/管子间/ + # 更名费/维修费/其他费用/评估费/保险费,以及以后新增的类型)全部归入「其他」 + _SUMMARY_TYPES = ['租金', '管理费', '水费', '电费', '违约金', '押金', '灯箱'] def init(self): tools.drop_view_if_exists(self.env.cr, self._table) @@ -36,7 +36,7 @@ class PropertyAccountsReceivableSummary(models.Model): for fname, tname in [ ('rent_unpaid', '租金'), ('management_unpaid', '管理费'), ('water_unpaid', '水费'), ('electricity_unpaid', '电费'), ('penalty_unpaid', '违约金'), ('deposit_unpaid', '押金'), - ('ad_unpaid', '广告灯箱费'), + ('lightbox_unpaid', '灯箱'), ]: main_cols += "\n COALESCE(SUM(CASE WHEN t.name = '%s' THEN r.submitted ELSE 0.0 END), 0.0) AS %s," % (tname, fname) excluded = ", ".join("'%s'" % t for t in self._SUMMARY_TYPES) @@ -61,7 +61,7 @@ class PropertyAccountsReceivableSummary(models.Model): def action_open_unpaid_detail(self): """未收明细:打开该合同下 未收/收部分 且 未对账 的应收账单, - 复用 view_property_accounts_receivable_tree,默认按应收类型分组""" + 复用 view_property_accounts_receivable_tree,不做分组,按应收类型倒序""" self.ensure_one() tree_view = self.env.ref('yuthon_property.view_property_accounts_receivable_tree') search_view = self.env.ref('yuthon_property_approval.view_property_accounts_receivable_search') @@ -79,7 +79,6 @@ class PropertyAccountsReceivableSummary(models.Model): ('is_reconciliation', '=', False), ], 'context': { - 'group_by': 'management_type_id', 'order': 'management_type_id desc', }, 'target': 'current', diff --git a/yuthon_property_approval/views/property_tenant_checkout_views.xml b/yuthon_property_approval/views/property_tenant_checkout_views.xml index 6334d6276..439e2b025 100644 --- a/yuthon_property_approval/views/property_tenant_checkout_views.xml +++ b/yuthon_property_approval/views/property_tenant_checkout_views.xml @@ -71,7 +71,7 @@ - + @@ -80,13 +80,21 @@ + + + + + + + - + +
@@ -144,7 +152,8 @@ - + + @@ -156,13 +165,6 @@ - - - - - - - diff --git a/yuthon_property_approval/views/receivable_unpaid_views.xml b/yuthon_property_approval/views/receivable_unpaid_views.xml index e91da5a38..2056b29e0 100644 --- a/yuthon_property_approval/views/receivable_unpaid_views.xml +++ b/yuthon_property_approval/views/receivable_unpaid_views.xml @@ -15,7 +15,7 @@ - +