Skip to content

Commit f0cd290

Browse files
Merge pull request #111 from mkumar-02/15.0-1.1.0
G2P-1054 Added condition check on Prepare Entitlement button.
2 parents b511850 + 724ef9c commit f0cd290

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

g2p_program_documents/models/entitlement_manager.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ def prepare_entitlements(self, cycle, beneficiaries):
1212
ents = super(DefaultEntitlementManagerForDocument, self).prepare_entitlements(
1313
cycle, beneficiaries
1414
)
15-
ents.copy_documents_from_beneficiary()
15+
16+
if ents:
17+
ents.copy_documents_from_beneficiary()
1618
return ents

g2p_program_registrant_info/models/entitlement_manager.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ def prepare_entitlements(self, cycle, beneficiaries):
1212
ents = super(DefaultEntitlementManagerRegInfo, self).prepare_entitlements(
1313
cycle, beneficiaries
1414
)
15-
for ent in ents:
16-
self.env[
17-
"g2p.program.registrant_info"
18-
].assign_reg_info_to_entitlement_from_membership(ent)
15+
if ents:
16+
for ent in ents:
17+
self.env[
18+
"g2p.program.registrant_info"
19+
].assign_reg_info_to_entitlement_from_membership(ent)
1920
return ents
2021

2122
def approve_entitlements(self, entitlements):

g2p_program_registrant_info/models/program_registrant_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ def open_new_tab(self):
140140
"target": "new",
141141
"flags": {"mode": "readonly"},
142142
"context": {"create": False, "edit": False},
143-
}
143+
}

0 commit comments

Comments
 (0)