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

!4292 添加功能

Browse Source 
Merge pull request !4292 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-08-04 11:09:39 +00:00
committed by Gitee
parent 6a3eaf250e 98da0d6d7d
commit d763211e0c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/views/property_lease_contract.xml
+4 -4
View File
@@ -28,7 +28,7 @@
string="生成租金费用" invisible="1"/>
<button name="action_generate_administrative_expenses" class="oe_link btn btn-primary" type="object"
string="生成管理费用" invisible="1"/>
<!-- <button name="action_copy_record1" type="object" string="拆分"/>-->
<button name="action_copy_record1" type="object" string="拆分"/>
</header>
<sheet>
<widget name="web_ribbon" title="新建" bg_color="text-bg-success"
@@ -80,7 +80,7 @@
<field name="title_address"/>
<field name="handling_opinions"/>
<field name="tenure_type" invisible="1"/>
<field name="is_child_contract" invisible="1"/>
<field name="is_child_contract" string="已拆分"/>
<field name="is_contract" invisible="1"/>
<field name="contract_source_id" invisible="not is_child_contract"/>
<field name="condition" readonly="1" invisible="1"/>
@@ -362,7 +362,7 @@
<button name="button_lease_extension" type="object" class="btn-primary" string="续租"/>
<button name="button_lease_return" type="object" class="btn-primary" string="退租"/>
<button name="button_lease_change" type="object" class="btn-primary" string="变更"/>
<!-- <button name="action_copy_record1" type="object" string="拆分"/>-->
<button name="action_copy_record1" type="object" string="拆分"/>
</header>
<field name="name"/>
<field name="contract_code" decoration-danger="is_equal"/>
@@ -461,7 +461,7 @@
<field name="department_id" invisible="1"/>
<field name="name" readonly="0"/>
<field name="use_address" readonly="0"/>
<field name="is_child_contract" invisible="1"/>
<field name="is_child_contract" string="已拆分"/>
<field name="is_contract" invisible="1"/>
<field name="contract_source_id" invisible="not is_child_contract"/>
<field name="contact_state" invisible="1"/>
yuthon_salary/models/inherit_hr_payroll_structure.py
+1 -1
View File
@@ -64,7 +64,7 @@ class HrPayrollStructure(models.Model):
'category_id': category_id.id,
'code': code,
'amount_fix': amount,
'struct_id': self.id.origin
'struct_id': self.id
})
else:
salary_id.write({