diff --git a/yuthon_property/models/property_deposit_list.py b/yuthon_property/models/property_deposit_list.py
index 4fbd2a8e1..9b26557e3 100644
--- a/yuthon_property/models/property_deposit_list.py
+++ b/yuthon_property/models/property_deposit_list.py
@@ -6,7 +6,10 @@ class PropertyDepositList(models.Model):
_description = '押金列表'
property_id = fields.Many2one('yuthon.property', string='物业')
+ admin_id = fields.Many2one(related='property_id.admin_id', string="片区管理员")
lessee_id = fields.Many2one('property.tenant.information', string='承租方')
+ company_id = fields.Many2one(related='property_id.company_id', string="公司")
+
is_push = fields.Boolean(string='是否推送')
def unlink(self):
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 5c747ac34..c1d291533 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -6,7 +6,6 @@ from pypinyin import pinyin,lazy_pinyin
class YuthonProperty(models.Model):
_name = 'yuthon.property'
_description = '物业管理'
- _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
_rec_name = 'name'
_order = 'first_letter'
@@ -84,6 +83,11 @@ class YuthonProperty(models.Model):
first_letter = fields.Char(string="首字母", compute='_compute_first_letter', store=True)
+ # 报表新增字段
+ title_certificate = fields.Char(string="产权证号")
+ vacant_duration = fields.Float(string="空置时长", digits=(16, 2))
+
+
@api.depends('name')
def _compute_first_letter(self):
for record in self:
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 36f33173d..c009a3740 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -344,6 +344,49 @@
+
+
+ yuthon.property.management.area.report
+ yuthon.property
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 管理面积报表
+ yuthon.property
+ tree
+
+
+
+
+ yuthon.property.rent.area.report
+ yuthon.property
+
+
+
+
+
+
+
+
+
+
+
+
+ 可租面积报表
+ yuthon.property
+ tree
+
物业
yuthon.property
diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index 0206ec869..c3e1675c5 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -260,6 +260,10 @@ class PropertyAccountsReceivable(models.Model):
contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
penalty = fields.Float(string="违约金")
penalty_date = fields.Date(string="违约金日期")
+ # 报表新增字段
+ rent_owed = fields.Float(string="欠租金额")
+ per_day = fields.Float(string="每天违约金（元/天）")
+
@api.model_create_multi
def create(self, vals_list):
@@ -534,7 +538,7 @@ class PropertyElectricReading(models.Model):
contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
is_message = fields.Boolean()
reading_state = fields.Selection([
- ('wait', '待抄'), ('finish', '已抄表')])
+ ('wait', '待抄'), ('finish', '已抄表')], string="状态", default="wait")
def button_push_electric(self):
for rec in self:
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
index 729ac0d63..25f35b9e2 100644
--- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml
+++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
@@ -75,6 +75,25 @@
+
+
+ property.deposit.list.report.tree
+ property.deposit.list
+
+
+
+
+
+
+
+
+
+
+
+ 押金累计欠收报表
+ property.deposit.list
+ tree
+
批量推送
@@ -372,6 +391,89 @@
tree
{'group_by': 'contract_id'}
+
+
+ property.accounts.receivable.tree.form
+ property.accounts.receivable
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同应收报表
+ tree
+ property.accounts.receivable
+
+
+
+ property.accounts.receivable.report
+ property.accounts.receivable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 违约金明细报表
+ property.accounts.receivable
+ tree
+
+
+
+ property.received.month.report
+ property.accounts.receivable
+
+
+
+
+
+
+
+
+
+
+
+
+ 本月实收报表
+ property.accounts.receivable
+ tree
+
+
+
+ property.penalty.list.report
+ property.accounts.receivable
+
+
+
+
+
+
+
+ 累计欠收报表
+ property.accounts.receivable
+ tree
+
批量生成违约金
@@ -407,6 +509,7 @@
code
action = model.button_all_reconciliation()
+
property.penalty.list.tree
property.penalty.list
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 1f68cfe03..dc7dfc929 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -753,6 +753,28 @@
+
+
+ yuthon.property.rented.area.report
+ property.lease.contract
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已租面积报表
+ property.lease.contract
+ tree
+
合同管理
property.lease.contract
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index c20bc8a92..b24c4f6b0 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -336,4 +336,46 @@
name="零星工程"
parent="property_construction_process_menu"
action="view_property_delegated_agent_action"/>
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file