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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-10-12 19:26:49 +08:00
parent b2cec3c697
commit 06b2aa9884
9 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/models/yuthon_property_message.py
+2
View File
@@ -5,8 +5,10 @@ from odoo.exceptions import UserError, ValidationError
class YuthonPropertyMessage(models.Model):
_name = 'yuthon.property.message'
_description = '产权管理'
_order = 'sequence asc'
name = fields.Char(string='产权地址')
sequence = fields.Char(string='序号')
owner_id = fields.Many2one('yuthon.owner.message', string="权属人")
title_certificate = fields.Char(string="产权证号", default="无产权")
pooled_area = fields.Float(string="公摊面积", digits=(16, 4))
yuthon_property/views/property_management_list_views.xml
+1 -1
View File
@@ -5,8 +5,8 @@
<field name="model">property.management.list</field>
<field name="arch" type="xml">
<tree editable="bottom" string="管理费列表" edit="false" delete="false" limit="15">
<field name="lessee_id" options="{'no_create': True}"/>
<field name="property_id" options="{'no_create': True}"/>
<field name="lessee_id" options="{'no_create': True}"/>
<field name="area"/>
<field name="original_amount"/>
<field name="due_date"/>
yuthon_property/views/property_meter_archives_views.xml
+10 -8
View File
@@ -88,22 +88,24 @@
<field name="model">meter.archives.line</field>
<field name="arch" type="xml">
<tree string="电表任务" create="False" editable="bottom" js_class="custom_meter_button" decoration-success="not current_read" >
<field name="archives_id" string="电表名"/>
<field name="sequence" column_invisible="1"/>
<field name="number" column_invisible="1"/>
<field name="epitope_values_id" domain="[('type', '=', 'ammeter')]"/>
<field name="unit_number"/>
<field name="yuthon_property_ids" string="地址" readonly="1" widget="many2many_tags"/>
<field name="lessee_id" options="{'no_create': True}" readonly="1"/>
<field name="meter_date" readonly="1"/>
<field name="archives_id" string="电表名"/>
<field name="unit_number"/>
<field name="gauge_magnification" readonly="1"/>
<field name="last_meter" readonly="1"/>
<field name="last_dosage" readonly="1"/>
<field name="last_read" readonly="1"/>
<field name="current_meter" readonly="1"/>
<field name="current_read"/>
<field name="current_meter" readonly="1"/>
<field name="unit"/>
<field name="receivables"/>
<field name="number" column_invisible="1"/>
<field name="yuthon_property_ids" string="地址" readonly="1" widget="many2many_tags" />
<field name="lessee_id" options="{'no_create': True}" readonly="1"/>
<field name="epitope_values_id" domain="[('type', '=', 'watermeter')]"/>
<field name="last_meter" readonly="1"/>
<field name="last_dosage" readonly="1"/>
<field name="line_loss" column_invisible="1"/>
<field name="archives_state"/>
<field name="employee_ids" widget="many2many_tags" options="{'no_create': True}" readonly="1"/>
<field name="line_loss" column_invisible="1"/>
yuthon_property/views/property_meter_water_views.xml
+9 -8
View File
@@ -92,20 +92,21 @@
<field name="arch" type="xml">
<tree string="水表任务" create="0" editable="bottom" js_class="custom_water_button" decoration-success="not current_read" >
<field name="sequence" column_invisible="1"/>
<field name="meter_date" readonly="1"/>
<field name="water_id" string="水表名"/>
<field name="unit_number"/>
<field name="gauge_magnification" readonly="1"/>
<field name="last_read" readonly="1"/>
<field name="current_read"/>
<field name="current_meter" readonly="1"/>
<field name="unit"/>
<field name="receivables"/>
<field name="number" column_invisible="1"/>
<field name="yuthon_property_ids" string="地址" readonly="1" widget="many2many_tags" />
<field name="lessee_id" options="{'no_create': True}" readonly="1"/>
<field name="meter_date" readonly="1"/>
<field name="epitope_values_id" domain="[('type', '=', 'watermeter')]"/>
<field name="gauge_magnification" readonly="1"/>
<field name="last_meter" readonly="1"/>
<field name="last_dosage" readonly="1"/>
<field name="last_read" readonly="1"/>
<field name="current_meter" readonly="1"/>
<field name="current_read"/>
<field name="unit"/>
<field name="receivables"/>
<field name="last_dosage" readonly="1"/>
<field name="line_loss" column_invisible="1"/>
<field name="employee_ids" widget="many2many_tags" options="{'no_create': True}" readonly="1"/>
</tree>
yuthon_property/views/property_rent_list_views.xml
+3 -3
View File
@@ -5,18 +5,18 @@
<field name="model">property.rent.list</field>
<field name="arch" type="xml">
<tree editable="bottom" string="租金列表" decoration-danger = "charge_status == 'unpaid'"
decoration-success="charge_status == 'fully_paid'" js_class="custom_rent_list_button" edit="false" delete="false">
decoration-success="charge_status == 'fully_paid'" js_class="custom_rent_list_button" edit="false" delete="false" limit="15">
<field name="property_id" options="{'no_create': True}" column_invisible="1"/>
<field name="lessee_id" options="{'no_create': True}"/>
<field name="admin_id" options="{'no_create': True}"/>
<field name="due_date"/>
<field name="original_amount"/>
<field name="discount_amount"/>
<field name="remark"/>
<field name="charge_status" column_invisible="1"/>
<field name="multiplier" column_invisible="1"/>
<field name="is_push" optional="hide"/>
<field name="admin_id" options="{'no_create': True}"/>
<field name="create_time"/>
<field name="remark"/>
<field name="last_update_time" optional="hide"/>
<field name="is_billing" column_invisible="1"/>
<field name="is_reconciliation" column_invisible="1"/>
yuthon_property/views/yuthon_property_message_views.xml
+1
View File
@@ -5,6 +5,7 @@
<field name="model">yuthon.property.message</field>
<field name="arch" type="xml">
<tree string="产权管理">
<field name="sequence"/>
<field name="name"/>
<field name="owner_id"/>
<field name="title_certificate"/>
yuthon_property/wizard/meter_price_wizard.py
+7 -6
View File
@@ -52,11 +52,12 @@ class MeterPriceWizard(models.TransientModel):
'meter_date': self.price_date,
'line_loss': self.line_loss
})
self.env['hydropower.logs'].create({
'meter_type': 'electric',
'logs_date': self.price_date,
'price': self.price,
'line_loss': self.line_loss,
})
self.env['hydropower.logs'].create({
'meter_type': 'electric',
'logs_date': self.price_date,
'price': self.price,
'line_loss': self.line_loss,
})
yuthon_property/wizard/water_price_wizard.py
+7 -6
View File
@@ -52,12 +52,13 @@ class WaterPriceWizard(models.TransientModel):
'meter_date': self.price_date,
'line_loss': self.line_loss
})
self.env['hydropower.logs'].create({
'meter_type': 'water',
'logs_date': self.price_date,
'price': self.price,
'line_loss': self.line_loss,
})
self.env['hydropower.logs'].create({
'meter_type': 'water',
'logs_date': self.price_date,
'price': self.price,
'line_loss': self.line_loss,
})
yuthon_property_approval/views/inherit_yuthon_property_views.xml
+5 -5
View File
@@ -65,12 +65,12 @@
<button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
</header>
</xpath>
<xpath expr="//field[@name='admin_id']" position="before">
<xpath expr="//field[@name='create_time']" position="before">
<field name="company_id" options="{'no_create': True}"/>
</xpath>
<xpath expr="//field[@name='property_id']" position="before">
<field name="property_address"/>
<field name="contract_id" string="合同编号" options="{'no_create': True}"/>
<xpath expr="//field[@name='property_id']" position="after">
<field name="contract_id" string="合同编号" options="{'no_create': True}"/>
<field name="property_address"/>
</xpath>
</field>
</record>
@@ -313,7 +313,7 @@
<button name="penalty_wizard" string="违约金明细" type="object" class="btn btn-primary" invisible="not is_rent"/>
<button name="button_accounts_wizard" string="操作" type="object" class="btn btn-primary"/>
</xpath>
<xpath expr="//field[@name='payout_date']" position="after">
<xpath expr="//field[@name='management_type_id']" position="after">
<field name="is_rent" column_invisible="1"/>
<field name="property_name" width="350px"/>
<field name="property_ids" options="{'no_create': True}" widget="many2many_tags" column_invisible="1"/>