diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index d2961c5a0..afb3385bb 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -301,10 +301,10 @@ class PropertyBankStatements(models.Model):
"default_bank_branch": self.bank_branch,
"default_account": record.name,
"default_actual_total": record.original_amount,
- "default_reconciliation_line_ids": all_vals,
+ "default_reconciliation_line_ids": all_vals, # 租金，应收日期排序、管理费、电、水、押金
'default_amount_reconciled': self.no_amount,
"default_receivable_total": total_rent_month,
- "dialog_size" : "extra-large",
+ "dialog_size": "extra-large",
"default_order": "due_date desc",
}
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 480e33f1c..020fe1fef 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -77,7 +77,7 @@
-
+
@@ -474,7 +474,7 @@
-
+
diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
index 5473c4d62..77578a102 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
@@ -37,12 +37,12 @@
+
-
diff --git a/yuthon_report/__manifest__.py b/yuthon_report/__manifest__.py
index 023b18e84..0b5d051da 100644
--- a/yuthon_report/__manifest__.py
+++ b/yuthon_report/__manifest__.py
@@ -9,7 +9,6 @@
'depends': ['base', 'web', 'yuthon_property'],
'data': [
'views/menu.xml',
- 'views/yuthon_report_property.xml',
'views/ledger_report_views.xml',
'views/receivable_report_views.xml',
'views/yuthon_report_res_partner.xml',
diff --git a/yuthon_report/models/__init__.py b/yuthon_report/models/__init__.py
index e6f77f50a..16d9cfc99 100644
--- a/yuthon_report/models/__init__.py
+++ b/yuthon_report/models/__init__.py
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from . import res_partner
-from . import report_property
from . import ledger_report
from . import receivable_report
\ No newline at end of file
diff --git a/yuthon_report/models/report_property.py b/yuthon_report/models/report_property.py
deleted file mode 100644
index 5016c3963..000000000
--- a/yuthon_report/models/report_property.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from odoo import fields, models, api
-
-
-class YuthonProperty(models.Model):
- _inherit = 'yuthon.property'
-
- @api.model
- def get_report_data(self, params):
- domain = []
- if params.get("keyword"):
- keyword = params["keyword"]
- # 获取权属类型的存储值与显示值映射（如：{'self': '自有', 'agency': '代管'}）
- tenure_type_selection = self._fields['tenure_type']._description_selection(self.env)
- matched_tenure_values = [
- key for key, label in tenure_type_selection
- if keyword in label # 匹配中文显示值
- ]
- conditions = [
- ("name", "ilike", keyword),
- ("company_id.name", "ilike", keyword),
- ("admin_id.name", "ilike", keyword)
- ]
-
- if matched_tenure_values:
- conditions.append(("tenure_type", "in", matched_tenure_values))
- else:
- conditions.append(("tenure_type", "ilike", keyword))
- domain += ["|"] * (len(conditions) - 1) + conditions
- properties = self.search(domain, limit=100)
- # 构造返回数据列表
- return [
- {
- "资产名称": p.name or "",
- "管理面积": p.management_area or 0.0,
- "可租面积": p.rent_area or 0.0,
- "产权面积": p.equity_area or 0.0,
- "产权证号": p.title_deed or "",
- "产权地址": p.title_address.name or "" if p.title_address else "",
- "资产目前状态": dict(self._fields['property_state']._description_selection(self.env))[p.property_state]
- }
- for p in properties
- ]
\ No newline at end of file
diff --git a/yuthon_report/views/yuthon_report_property.xml b/yuthon_report/views/yuthon_report_property.xml
deleted file mode 100644
index 9b2ddd497..000000000
--- a/yuthon_report/views/yuthon_report_property.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- 资产报表
- youthon_report_client
-
- {
- "sideBar": true,
- "report_config": {
- "model": "yuthon.property",
- "method": "get_report_data",
- "search_fields": [
- {"name": "keyword", "type": "char", "label": "资产名称关键字"},
- {"name": "property_state", "type": "selection", "label": "资产状态",
- "selection": [
- ('to', '待评估'), ('done', '已评估'), ('ing', '评估中'),
- ('ing_handover', '移交中'), ('done_handover', '已移交'),
- ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
- ('signed', '已备案'), ('leased', '已租'), ('idle', '空置'),
- ('no_lease', '不可租'), ('leasing', '在租'), ('self', '自用')
- ]}
- ],
- "columns": [
- {"headerName": "资产名称", "field": "资产名称", "flex": 1},
- {"headerName": "管理面积", "field": "管理面积", "flex": 1},
- {"headerName": "可租面积", "field": "可租面积", "flex": 1},
- {"headerName": "产权面积", "field": "产权面积", "flex": 1},
- {"headerName": "产权证号", "field": "产权证号", "flex": 1},
- {"headerName": "产权地址", "field": "产权地址", "flex": 1},
- {"headerName": "资产目前状态", "field": "资产目前状态", "flex": 1}
- ]
- }
- }
-
-
-
-
-
-
diff --git a/yuthon_salary/__manifest__.py b/yuthon_salary/__manifest__.py
index e14ba9adb..2537b0920 100644
--- a/yuthon_salary/__manifest__.py
+++ b/yuthon_salary/__manifest__.py
@@ -66,7 +66,7 @@
'yuthon_salary/static/src/xml/salary_validation_button.xml',
'yuthon_salary/static/src/xml/salary_return_button.xml',
'yuthon_salary/static/src/xml/salary_year_button.xml',
- 'yuthon_salary/static/src/views/list/*',
+ # 'yuthon_salary/static/src/views/list/*',
]
},
'installable': True,
diff --git a/yuthon_salary/views/yuthon_salary_year_views.xml b/yuthon_salary/views/yuthon_salary_year_views.xml
index eca24da19..c606cc3fb 100644
--- a/yuthon_salary/views/yuthon_salary_year_views.xml
+++ b/yuthon_salary/views/yuthon_salary_year_views.xml
@@ -10,7 +10,6 @@
-