pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-11-12 18:51:57 +08:00
parent 1875ee23a7
commit 5bfb3302e6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/inherit_yuthon_property.py
+2 -1
View File
@@ -996,7 +996,8 @@ class PropertyRentList(models.Model):
contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
tenure_type = fields.Selection(related='contract_id.tenure_type', string="权属类型", store=True)
property_address = fields.Text(string="物业信息", compute='get_property_address')
contract_sort = fields.Selection([('property', '物业'), ('guanggao', '广告位'),('parking', '停车场'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型")
contract_sort = fields.Selection(related='contract_id.contract_sort', string="资产类型", store=True) # 数据库存储问题，无意义
contract_sort1 = fields.Selection([('property', '物业'), ('guanggao', '广告位'),('parking', '停车场'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型", default='property')
company_id = fields.Many2one(related='contract_id.lessor_id', string="出租方公司", store=True)
is_company = fields.Boolean(string='是否是本公司', compute='_compute_is_company', store=False)
yuthon_property_approval/views/inherit_yuthon_property_views.xml
+1 -1
View File
@@ -123,7 +123,7 @@
<field name="tenure_type"/>
<field name="contract_id"/>
<group expand="0" string="group_by">
<filter name="contract_sort" string="资产类型" context="{'group_by':'contract_sort'}"/>
<filter name="contract_sort1" string="资产类型" context="{'group_by':'contract_sort1'}"/>
<filter name="group_company_id" string="公司" context="{'group_by':'company_id'}"/>
<filter name="group_tenure_type" string="权属类型" context="{'group_by':'tenure_type'}"/>
<filter name="group_admin_id" string="管理员" context="{'group_by':'admin_id'}"/>
yuthon_property_approval/wizard/property_rental_wizard.py
+2 -2
View File
@@ -53,7 +53,7 @@ class PropertyRentalWizard(models.Model):
"contract_id": record.id,
"due_date": start_date,
'multiplier': multiplier,
"contract_sort": record.contract_sort,
"contract_sort1": record.contract_sort,
'acc_type': acc_type,
"lessee_id": record.lessee_id.id,
"property_id": property_id,
@@ -66,7 +66,7 @@ class PropertyRentalWizard(models.Model):
"contract_id": record.id,
"due_date": start_date,
'multiplier': multiplier,
"contract_sort": record.contract_sort,
"contract_sort1": record.contract_sort,
"lessee_id": record.lessee_id.id,
'acc_type': acc_type,
"property_id": property_id,