diff --git a/yuthon_report/__manifest__.py b/yuthon_report/__manifest__.py index 45d99da1a..7e786082a 100644 --- a/yuthon_report/__manifest__.py +++ b/yuthon_report/__manifest__.py @@ -9,7 +9,7 @@ 'depends': ['base', 'web', 'yuthon_property'], 'data': [ 'views/menu.xml', - # 'views/yuthon_report_property.xml', + 'views/yuthon_report_property.xml', 'views/yuthon_report_res_partner.xml', ], 'installable': True, diff --git a/yuthon_report/models/__init__.py b/yuthon_report/models/__init__.py index 9d113ad7c..2f31ceef3 100644 --- a/yuthon_report/models/__init__.py +++ b/yuthon_report/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- from . import res_partner -# from . import report_property \ No newline at end of file +from . import report_property diff --git a/yuthon_report/models/res_partner.py b/yuthon_report/models/res_partner.py index 36e703fa7..80ce07071 100644 --- a/yuthon_report/models/res_partner.py +++ b/yuthon_report/models/res_partner.py @@ -10,7 +10,4 @@ class ResPartner(models.Model): if params.get("keyword"): domain.append(("name", "ilike", params["keyword"])) partners = self.search(domain, limit=100) - return [ - {"customer": p.name, "amount": p.credit} - for p in partners - ] + return [{"customer": p.name, "amount": p.credit}for p in partners] diff --git a/yuthon_report/views/yuthon_report_res_partner.xml b/yuthon_report/views/yuthon_report_res_partner.xml index 73740df04..cf80283c6 100644 --- a/yuthon_report/views/yuthon_report_res_partner.xml +++ b/yuthon_report/views/yuthon_report_res_partner.xml @@ -7,20 +7,20 @@ youthon_report_client { - "sideBar":true, - "report_config": { - "model": "res.partner", - "method": "get_report_data", - "search_fields": [ - {"name": "date_start", "type": "date", "label": "开始日期"}, - {"name": "date_end", "type": "date", "label": "结束日期"}, - {"name": "keyword", "type": "char", "label": "关键字"} - ], - "columns": [ - {"headerName": "客户", "field": "customer", "flex": 1}, - {"headerName": "销售额", "field": "amount", "flex": 1} - ] - } + "sideBar":true, + "report_config": { + "model": "res.partner", + "method": "get_report_data", + "search_fields": [ + {"name": "date_start", "type": "date", "label": "开始日期"}, + {"name": "date_end", "type": "date", "label": "结束日期"}, + {"name": "keyword", "type": "char", "label": "关键字"} + ], + "columns": [ + {"headerName": "客户", "field": "customer", "flex": 1}, + {"headerName": "销售额", "field": "amount", "flex": 1} + ] + } }