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

!4237 !4236 添加功能

Browse Source 
Merge pull request !4237 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-01 02:33:38 +00:00
committed by Gitee
parent bdfe00dc96 9d01af0913
commit 13374be9fa
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+5 -7
View File
@@ -158,18 +158,16 @@ class PropertyReconciliationWizard(models.Model):
management_type_id = self.env['yuthon.management.type'].search([('name', '=', '违约金')])
if line.collection_type == 'penalty':
domain2 = [
('lessee_id', '=', first_line.tenant_id.id),
('is_reconciliation', '=', True),
('due_date', '>=', first_day),
('due_date', '<=', last_day),
('due_date', '=', line.due_date),
('property_id', '=', line.property_id.id),
('contract_id', '=', line.contract_id.id)
('contract_id', '=', line.contract_id.id),
('collection_type', '=', 'rent'),
]
receivable_id2 = self.env['property.accounts.receivable'].search(domain2)
reconciliation_id = self.env['property.reconciliation.line'].search(domain2, limit=1)
self.env['property.accounts.receivable'].create({
'is_reconciliation': True,
'due_date': line.due_date,
'penalty': receivable_id2.submitted,
'penalty': reconciliation_id.rent,
'management_type_id': management_type_id.id,
'lessee_id': first_line.tenant_id.id,
'property_id': line.property_id.id,
yuthon_salary/models/inherit_hr_payslip.py
+1 -1
View File
@@ -672,7 +672,7 @@ class InheritHrPayslip(models.Model):
record.monthly_overtime +
record.excellent_employees +
record.commuting_deduction +
record.retroactive_insurance -
record.retroactive_insurance +
record.base_salary_deduction
)