Merge pull request #368 from OpenSPP/fix-inkind-entitlement-to-approve-error

Fix issue with In-kind Entitlement when clicking 'To Approve' button

Author: gonzalesedwin1123

spp_programs/models/cycle.py

@@ -19,3 +19,33 @@ def _compute_inkind_entitlements_count(self):
         for rec in self:
             entitlements_count = self.env["g2p.entitlement.inkind"].search_count([("cycle_id", "=", rec.id)])
             rec.update({"inkind_entitlements_count": entitlements_count})
+
+    def get_entitlements(
+        self,
+        state,
+        entitlement_model="g2p.entitlement",
+        offset=0,
+        limit=None,
+        order=None,
+        count=False,
+    ):
+        """
+        Query entitlements based on state.
+        Overrides OpenG2P's get_entitlements method to fix the issue with search_count offset parameter.
+        :param state: List of states
+        :param entitlement_model: String value of entitlement model to search
+        :param offset: Optional integer value for the ORM search offset
+        :param limit: Optional integer value for the ORM search limit
+        :param order: Optional string value for the ORM search order fields
+        :param count: Optional boolean for executing a search-count (if true) or search (if false: default)
+        :return:
+        """
+        domain = [("cycle_id", "=", self.id)]
+        if state:
+            if isinstance(state, str):
+                state = [state]
+            domain += [("state", "in", state)]
+
+        if count:
+            return self.env["g2p.cycle.membership"].search_count(domain, limit=limit)
+        return self.env[entitlement_model].search(domain, offset=offset, limit=limit, order=order)