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

!9592 !9591 添加功能

Browse Source 
Merge pull request !9592 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-03-11 09:38:29 +00:00
committed by Gitee
parent 32be793dd5 c46dd9a763
commit ef8a4a8bb3
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/security/property_group.xml
+7 -5
View File
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- <record model="ir.rule" id="accounts_receivable_rule">-->
<!-- <field name="name">应收账单多公司</field>-->
<!-- <field name="model_id" ref="model_property_accounts_receivable"/>-->
<!-- <field name="domain_force">[('company_id2', 'in', company_ids)]</field>-->
<!-- </record>-->
<record id="module_group_administrator" model="ir.module.category">
<field name="name">物业管理 （片区管理员</field>
</record>
<record id="group_area_administrator" model="res.groups">
<field name="name">管理员</field>
<field name="category_id" ref="module_group_administrator"/>
</record>
</odoo>
yuthon_property_approval/views/property_lease_contract.xml
+4 -2
View File
@@ -87,6 +87,8 @@
<field name="title_information" invisible="contract_sort != 'property'"/>
<field name="address_for_delivery" invisible="contract_sort != 'property'"/>
<field name="rental_purposes" options="{'no_open': True}"/>
<field name="actual_start_time" groups="yuthon_property_approval.group_area_administrator"/>
<field name="actual_end_time" groups="yuthon_property_approval.group_area_administrator"/>
</group>
</group>
<group>
@@ -638,8 +640,8 @@
<field name="cycle_dict" class="me-2"
style="max-width: 11rem !important;"/>
</div>
<field name="actual_start_time" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="actual_end_time" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="actual_start_time" groups="yuthon_property_approval.group_area_administrator"/>
<field name="actual_end_time" groups="yuthon_property_approval.group_area_administrator"/>
<field name="total_area" invisible="contract_sort == 'ads'"/>
<field name="rent" string="月租金" invisible="cycle_dict != 'monthly'"/>
<field name="rent" string="季租金" invisible="cycle_dict != 'quarter'"/>
yuthon_property_approval/wizard/property_rental_wizard.py
+1 -1
View File
@@ -233,7 +233,7 @@ class PropertyRentalWizard(models.Model):
new_version = False
# 当期应收日期
if not record.is_contract and new_version:
if new_version:
if start_year_month <= date_field_year_month <= end_year_month:
if rent_id.period_rent != 0 and record.contract_sort not in ['guanggao', 'guanzi', 'room']:
self.create_rent_list(record, rent_id, rent_amount, start_date, multiplier)