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-08 16:30:36 +08:00
parent b1099ede25
commit 40ace09ea7
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/models/yuthon_property.py
+1 -1
View File
@@ -611,7 +611,7 @@ class YuthonPropertyEnergy(models.Model):
_description = '电表'
property_meter_archives_id = fields.Many2one('property.meter.archives', string="电表编号")
rate = fields.Integer(related='property_meter_archives_id.gauge_magnification', string="倍率", store=True)
unit_number = fields.Char(related='property_meter_archives_id.unit_number', string="单元编号/用途", store=True)
standard_id = fields.Many2one(related='property_meter_archives_id.standards_id', string="标准", store=True)
installation_date = fields.Date(related='property_meter_archives_id.start_time', string="安装日期")
demolition_date = fields.Date(related='property_meter_archives_id.end_time', string="拆除日期")
yuthon_property/views/yuthon_property_views.xml
+1 -1
View File
@@ -247,7 +247,7 @@
<tree editable="bottom">
<field name="yuthon_property_id" column_invisible="1"/>
<field name="property_meter_archives_id" options="{'no_open': True}"/>
<field name="rate"/>
<field name="unit_number"/>
<field name="standard_id" options="{'no_open': True}"/>
<field name="installation_date"/>
<field name="demolition_date"/>
yuthon_property_approval/views/property_lease_contract.xml
+40
View File
@@ -682,6 +682,46 @@
</tree>
</field>
</page>
<notebook class="o_collapsible_notebook">
<page string="租金明细" invisible="contract_sort != 'property'">
<field name="breakdown_ids" string=" ">
<tree editable="bottom" delete="false">
<field name="breakdown_id" column_invisible="1"/>
<field name="unit_price"/>
<field name="monthly_amount"/>
<field name="start_data"/>
<field name="end_data"/>
<field name="month_number"/>
<field name="period_rent"/>
</tree>
</field>
</page>
<page string="广告位租金明细" invisible="contract_sort != 'guanggao'">
<field name="breakdown_ids" string=" ">
<tree editable="bottom" delete="false">
<field name="breakdown_id" column_invisible="1"/>
<field name="unit_price"/>
<field name="monthly_amount"/>
<field name="start_data"/>
<field name="end_data"/>
<field name="month_number"/>
<field name="period_rent"/>
</tree>
</field>
</page>
<page string="管子间租金明细" invisible="contract_sort != 'guanzi'">
<field name="breakdown_ids" string=" ">
<tree editable="bottom" delete="false">
<field name="breakdown_id" column_invisible="1"/>
<field name="unit_price"/>
<field name="monthly_amount"/>
<field name="start_data"/>
<field name="end_data"/>
<field name="month_number"/>
<field name="period_rent"/>
</tree>
</field>
</page>
<page string="管理费明细" invisible="not is_manage">
<field name="management_breakdown_ids" string=" ">
<tree editable="bottom">
yuthon_salary/views/inherit_hr_payslip_views.xml
+7 -8
View File
@@ -14,7 +14,6 @@
</xpath>
<xpath expr="//field[@name='employee_id']" position="attributes">
<attribute name="widget">false</attribute>
<attribute name="options">"{'no_open': True}"</attribute>
</xpath>
<xpath expr="//field[@name='basic_wage']" position="attributes">
<attribute name="column_invisible">1</attribute>
@@ -248,7 +247,7 @@
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
<button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1" />
<field name="date_of_entry"/>
<field name="bank_account_id"/>
<field name="actual_salary"/>
@@ -318,7 +317,7 @@
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
<button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1"/>
<field name="date_of_entry"/>
<field name="bank_account_id"/>
<field name="actual_salary"/>
@@ -375,7 +374,7 @@
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
<button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1"/>
<field name="date_of_entry"/>
<field name="bank_account_id"/>
<field name="actual_salary"/>
@@ -430,7 +429,7 @@
<button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1"/>
<field name="date_of_entry"/>
<field name="total_before_tax"/>
<field name="three_one"/>
@@ -503,7 +502,7 @@
<button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1"/>
<field name="date_of_entry"/>
<field name="total_before_tax"/>
<field name="three_one"/>
@@ -558,7 +557,7 @@
<button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
<button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
<field name="employee_id" string="姓名" readonly="1"/>
<field name="date_of_entry"/>
<field name="total_before_tax"/>
<field name="three_one"/>
@@ -613,7 +612,7 @@
<button name="action_put_salary_wizard" string="推送" type="object" class="oe_highlight"/>
<button name="action_return_wizard" string="退回" type="object" class="oe_highlight"/>
</header>
<field name="employee_id" string="姓名" options="{'no_open': True}"/>
<field name="employee_id" string="姓名"/>
<field name="struct_id" string="职级"/>
<field name="card_type" optional="show"/>
<field name="identification_id" optional="show"/>