Merge pull request #5380 from expsa/kch_dev_odex25_ensan
[IMP] odex_benefit: IMP benefit
This commit is contained in:
commit
4d9ef96e53
|
|
@ -241,6 +241,8 @@ class SeasonalService(models.Model):
|
|||
|
||||
if rec.service_delivery_method == "cash":
|
||||
service_request.requested_service_amount = service_request.service_max_amount
|
||||
if service_request.requested_service_amount == 0:
|
||||
service_request.unlink()
|
||||
else:
|
||||
service_request.requested_service_amount = 0
|
||||
service_request.is_in_kind = True
|
||||
|
|
@ -265,6 +267,8 @@ class SeasonalService(models.Model):
|
|||
|
||||
if rec.service_delivery_method == "cash":
|
||||
service_request.requested_service_amount = service_request.service_max_amount
|
||||
if service_request.requested_service_amount == 0:
|
||||
service_request.unlink()
|
||||
else:
|
||||
service_request.requested_service_amount = 0
|
||||
service_request.is_in_kind = True
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ class ServiceRequest(models.Model):
|
|||
for rec in self:
|
||||
count = 1
|
||||
if rec.benefit_type == "family":
|
||||
count = len(rec.family_id.member_ids)
|
||||
count = len(rec.family_id.member_ids.filtered(lambda m: m.member_status == 'benefit'))
|
||||
if rec.service_cat.max_age > 0:
|
||||
count = len(
|
||||
rec.family_id.member_ids.filtered(lambda x: x.age <= rec.service_cat.max_age))
|
||||
|
|
|
|||
Loading…
Reference in New Issue