Merge pull request !4791 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-28 03:20:12 +00:00
committed by Gitee
11 changed files with 152 additions and 2 deletions
@@ -38,6 +38,7 @@ class InheritMaintenanceEquipment(models.Model):
equipment_number = fields.Char(string="数量")
equipment_unit = fields.Many2one('uom.uom', string="单位")
purchase_date = fields.Date(string="购入日期")
life = fields.Char(string="寿命")
@api.depends('company_id')
def _compute_company_id(self):
@@ -166,6 +166,10 @@
<span>购入日期:</span>
<field name="purchase_date"/>
</div>
<div>
<span>寿命:</span>
<field name="life"/>
</div>
</div>
</div>
</div>
+2
View File
@@ -18,6 +18,8 @@
'views/property_capacity.xml',
'views/property_collection_confirm.xml',
'views/property_eligibility.xml',
'views/yuthon_property_ledger_views.xml',
'views/property_lessee_analysis_viwes.xml',
'views/property_fitment.xml',
'views/property_information.xml',
'views/property_inventory_table.xml',
+3 -1
View File
@@ -53,4 +53,6 @@ from . import property_engineering_approval
from . import property_current_approval
from . import property_accounts_approval
from . import inherit_property_tenant_information
from . import property_meeting_approval
from . import property_meeting_approval
from . import property_lessee_analysis
from . import yuthon_property_ledger
@@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import models, fields, api, exceptions, _
from datetime import datetime, timedelta
class PropertyLesseeAnalysis(models.Model):
_name = 'property.lessee.analysis'
_description = '承租方租赁情况分析'
industry_id = fields.Many2one('yuthon.industry.setting', string='行业')
number_lessees = fields.Integer(string='承租方数量')
area = fields.Float(string='面积(㎡)')
area_ratio = fields.Float(string='面积占比')
total = fields.Float(string='上年租金收入合计')
total_ratio = fields.Float(string='收入占比')
@@ -0,0 +1,43 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import models, fields, api, exceptions, _
from datetime import datetime, timedelta
class YuthonPropertyLedger(models.Model):
_name = 'yuthon.property.ledger'
_description = '台账报表'
property_id = fields.Many2one('yuthon.property', string='资产地址')
equity_area = fields.Float(string='资产面积')
street = fields.Char(string='街道')
precinct_id = fields.Many2one('yuthon.precinct.message', string='小区')
registered_id = fields.Many2one('yuthon.purpose.evidence', string='证载用途')
property_state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'),
('ing_handover', '移交中'), ('done_handover', '已移交'),
('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
('signed', '已备案'), ('leased', '已租'), ('idle', '空置'),
('no_lease', '不可租'), ('leasing', '在租'), ('self', '自用')],
string='资产目前状态', default='to')
admin_id = fields.Many2one('res.users', string="片区管理员")
lessor_id = fields.Many2one('yuthon.property.company', string="出租单位")
lessee_id = fields.Many2one('property.tenant.information', string='承租方')
rental_address = fields.Char(string='出租地址')
credit_code = fields.Char(string='统一社会信用代码')
contact = fields.Char(string='联系人')
rental_purposes = fields.Many2one('yuthon.rental.purpose', string="出租用途")
approval_status = fields.Char(string='审批情况')
rental_method = fields.Selection([('yes', '公开招租'), ('no', '非公开招租')], string='出租方式')
contract_id = fields.Many2one('property.lease.contract', string="租赁合同号")
rental_area = fields.Float(string='出租面积')
appraisal_price = fields.Float(string='评估价(元/m² •月)')
first_year_rent = fields.Float(string="首年租金")
contract_date = fields.Date(string="合同签订日期")
term_start_time = fields.Date(string="合约开始时间", default=fields.Datetime.now)
term_end_time = fields.Date(string="合约结束时间")
rent_changes = fields.Char(string="合同期内租金变化")
unit_price = fields.Float(string="单价")
monthly_amount = fields.Float(string="月租金")
total_amount = fields.Float(string="合同总金额")
real_amount = fields.Float(string="实际已收到金额")
@@ -99,4 +99,7 @@ access_property_management_wizard, property_management_wizard,model_property_man
access_click_reconciliation_wizard, click_reconciliation_wizard,model_click_reconciliation_wizard,base.group_user,1,1,1,1
access_accounts_wizard, accounts_wizard,model_accounts_wizard,base.group_user,1,1,1,1
access_binding_information_wizard,binding_information_wizard,model_binding_information_wizard,base.group_user,1,1,1,1
access_yuthon_property_ledger, yuthon_property_ledger,model_yuthon_property_ledger,base.group_user,1,1,1,1
access_property_lessee_analysis,property_lessee_analysis,model_property_lessee_analysis,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
99 access_accounts_wizard accounts_wizard model_accounts_wizard base.group_user 1 1 1 1
100 access_binding_information_wizard binding_information_wizard model_binding_information_wizard base.group_user 1 1 1 1
101 access_yuthon_property_ledger yuthon_property_ledger model_yuthon_property_ledger base.group_user 1 1 1 1
102 access_property_lessee_analysis property_lessee_analysis model_property_lessee_analysis base.group_user 1 1 1 1
103
104
105
@@ -365,7 +365,7 @@
<field name="name">property.lease.contract.tree</field>
<field name="model">property.lease.contract</field>
<field name="arch" type="xml">
<tree create="false" string="物业合同管理">
<tree create="false" string="物业合同管理" multi_edit="1">
<header>
<!-- <button name="all_put_evaluation_plan" string="评估推送" type="object" class="btn btn-primary"/>-->
<button name="button_lease_extension" type="object" class="btn-primary" string="续租"/>
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_property_lessee_analysis_tree" model="ir.ui.view">
<field name="name">property.lessee.analysis.tree</field>
<field name="model">property.lessee.analysis</field>
<field name="arch" type="xml">
<tree string="承租方租赁情况分析" editable="bottom">
<field name="industry_id"/>
<field name="number_lessees"/>
<field name="area"/>
<field name="area_ratio"/>
<field name="total"/>
<field name="total_ratio"/>
</tree>
</field>
</record>
<record id="view_property_lessee_analysis_action" model="ir.actions.act_window">
<field name="name">承租方租赁情况分析</field>
<field name="res_model">property.lessee.analysis</field>
<field name="view_mode">tree</field>
</record>
</odoo>
@@ -395,4 +395,16 @@
name="资产信息"
action="yuthon_property.yuthon_property_action"
sequence="5"/>
<menuitem
id="yuthon_property_ledger_views_menu"
parent="property_approval_report_menu"
name="台账"
action="view_property_ledger_action"
sequence="10"/>
<menuitem
id="property_lessee_analysis_viwes_menu"
parent="property_approval_report_menu"
name="承租方分析"
action="view_property_lessee_analysis_action"
sequence="15"/>
</odoo>
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_property_ledger_tree" model="ir.ui.view">
<field name="name">property.ledger.tree</field>
<field name="model">yuthon.property.ledger</field>
<field name="arch" type="xml">
<tree string="台账报表" editable="bottom">
<field name="property_id"/>
<field name="equity_area"/>
<field name="street"/>
<field name="precinct_id"/>
<field name="registered_id"/>
<field name="property_state"/>
<field name="admin_id"/>
<field name="lessor_id"/>
<field name="lessee_id"/>
<field name="rental_address"/>
<field name="credit_code"/>
<field name="contact"/>
<field name="rental_purposes"/>
<field name="approval_status"/>
<field name="rental_method"/>
<field name="contract_id"/>
<field name="rental_area"/>
<field name="appraisal_price"/>
<field name="first_year_rent"/>
<field name="contract_date"/>
<field name="term_start_time"/>
<field name="term_end_time"/>
<field name="rent_changes"/>
<field name="unit_price"/>
<field name="monthly_amount"/>
<field name="total_amount"/>
<field name="real_amount"/>
</tree>
</field>
</record>
<record id="view_property_ledger_action" model="ir.actions.act_window">
<field name="name">台账</field>
<field name="res_model">yuthon.property.ledger</field>
<field name="view_mode">tree</field>
</record>
</odoo>