fix: sider issues
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 853d7f5..5c32c81 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -63,7 +63,7 @@
self.generate_invoice(with_payment_entry=settings.make_payment_entry, save=True)
- def generate_invoice(self, save=True):
+ def generate_invoice(self, save=True, with_payment_entry=False):
if not (self.paid or self.currency or self.amount):
frappe.throw(_("The payment for this membership is not paid. To generate invoice fill the payment details"))
@@ -140,7 +140,7 @@
frappe.sendmail(**email_args)
def generate_and_send_invoice(self):
- invoice = self.generate_invoice(False)
+ invoice = self.generate_invoice(save=False)
self.send_acknowlement()
def make_invoice(membership, member, plan, settings):
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index ce31b91..a7fad9d 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -6,14 +6,14 @@
import frappe
import erpnext
from erpnext.non_profit.doctype.member.member import create_member
-from frappe.utils import nowdate, getdate, add_months
+from frappe.utils import nowdate, add_months
from erpnext.stock.doctype.item.test_item import create_item
class TestMembership(unittest.TestCase):
def setUp(self):
# Get default company
company = frappe.get_doc("Company", erpnext.get_default_company())
-
+
# update membership settings
settings = frappe.get_doc("Membership Settings")
# Enable razorpay
@@ -58,11 +58,11 @@
# Should work fine
make_membership(self.member, { "from_date": nowdate() })
make_membership(self.member, { "from_date": add_months(nowdate(), 1) })
-
+
from frappe.utils.user import add_role
add_role("test@example.com", "Non Profit Manager")
frappe.set_user("test@example.com")
-
+
# create next membership with expiry not within 30 days
self.assertRaises(frappe.ValidationError, make_membership, self.member, {
"from_date": add_months(nowdate(), 2),
@@ -70,7 +70,7 @@
frappe.set_user("Administrator")
# create the same membership but as administrator
- new_entry = make_membership(self.member, {
+ make_membership(self.member, {
"from_date": add_months(nowdate(), 2),
"to_date": add_months(nowdate(), 3),
})