Merge pull request #111 from mkumar-02/15.0-1.1.0

G2P-1054 Added condition check on Prepare Entitlement button.
OpenG2P · Aug 3, 2023 · f0cd290 · f0cd290
2 parents b511850 + 724ef9c
commit f0cd290
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/g2p_program_documents/models/entitlement_manager.py b/g2p_program_documents/models/entitlement_manager.py
@@ -12,5 +12,7 @@ def prepare_entitlements(self, cycle, beneficiaries):
         ents = super(DefaultEntitlementManagerForDocument, self).prepare_entitlements(
             cycle, beneficiaries
         )
-        ents.copy_documents_from_beneficiary()
+
+        if ents:
+            ents.copy_documents_from_beneficiary()
         return ents
diff --git a/g2p_program_registrant_info/models/entitlement_manager.py b/g2p_program_registrant_info/models/entitlement_manager.py
@@ -12,10 +12,11 @@ def prepare_entitlements(self, cycle, beneficiaries):
         ents = super(DefaultEntitlementManagerRegInfo, self).prepare_entitlements(
             cycle, beneficiaries
         )
-        for ent in ents:
-            self.env[
-                "g2p.program.registrant_info"
-            ].assign_reg_info_to_entitlement_from_membership(ent)
+        if ents:
+            for ent in ents:
+                self.env[
+                    "g2p.program.registrant_info"
+                ].assign_reg_info_to_entitlement_from_membership(ent)
         return ents
 
     def approve_entitlements(self, entitlements):

diff --git a/g2p_program_registrant_info/models/program_registrant_info.py b/g2p_program_registrant_info/models/program_registrant_info.py
@@ -140,4 +140,4 @@ def open_new_tab(self):
             "target": "new",
             "flags": {"mode": "readonly"},
             "context": {"create": False, "edit": False},
-        }
+        }