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

!5598 !5597 添加功能

Browse Source 
Merge pull request !5598 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-10-12 10:08:41 +00:00
committed by Gitee
parent f8abe79b66 fd22fe2516
commit a970e1f303
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee/models/yuthon_hr_employee.py
+1 -1
View File
@@ -340,7 +340,7 @@ class YuthonHrEmployee(models.Model):
def onchange_user_role_id(self):
if self.user_role_id:
user_id = self.env['soong.user.role'].search([('id', '=', self.user_role_id.id)])
user_id.write({'personnel_ids': [(4, self.id)]})
user_id.write({'personnel_ids': [(4, self.id.origin)]})
@api.depends('quota_issued', 'user_year')
def _compute_remainder_year(self):
yuthon_property/wizard/meter_price_wizard.py
+13 -10
View File
@@ -28,21 +28,24 @@ class MeterPriceWizard(models.TransientModel):
('meter_date', '<=', end_date),
])
for valid in valid_contract_lines:
if valid.yuthon_property_ids:
contract_id = self.env['property.contract.line'].search([
('yuthon_property_id', '=', valid.yuthon_property_ids[0].id),
('start_time', '<=', self.price_date),
('end_date', '>=', self.price_date),
], limit=1)
if contract_id:
if contract_id.lease_contract_id.ele_price > 0:
unit = contract_id.lease_contract_id.ele_price
if valid.archives_id.type == 'fees':
if valid.yuthon_property_ids:
contract_id = self.env['property.contract.line'].search([
('yuthon_property_id', '=', valid.yuthon_property_ids[0].id),
('start_time', '<=', self.price_date),
('end_date', '>=', self.price_date),
], limit=1)
if contract_id:
if contract_id.lease_contract_id.ele_price > 0:
unit = contract_id.lease_contract_id.ele_price
else:
unit = self.price
else:
unit = self.price
else:
unit = self.price
else:
unit = self.price
unit = 0
valid.write({
'unit': unit,
yuthon_property/wizard/water_price_wizard.py
+13 -10
View File
@@ -28,21 +28,24 @@ class WaterPriceWizard(models.TransientModel):
('meter_date', '<=', end_date),
])
for valid in valid_contract_lines:
if valid.yuthon_property_ids:
contract_id = self.env['property.contract.line'].search([
('yuthon_property_id', '=', valid.yuthon_property_ids[0].id),
('start_time', '<=', self.price_date),
('end_date', '>=', self.price_date),
], limit=1)
if contract_id:
if contract_id.lease_contract_id.water_price > 0:
unit = contract_id.lease_contract_id.water_price
if valid.water_id.type == 'fees':
if valid.yuthon_property_ids:
contract_id = self.env['property.contract.line'].search([
('yuthon_property_id', '=', valid.yuthon_property_ids[0].id),
('start_time', '<=', self.price_date),
('end_date', '>=', self.price_date),
], limit=1)
if contract_id:
if contract_id.lease_contract_id.water_price > 0:
unit = contract_id.lease_contract_id.water_price
else:
unit = self.price
else:
unit = self.price
else:
unit = self.price
else:
unit = self.price
unit = 0
valid.write({
'unit': unit,