nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 20:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sider issues

Browse Source
This commit is contained in:
Rucha Mahabal
2021-01-20 20:48:51 +05:30
parent bd02a42904
commit 3575939386
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/non_profit/doctype/membership/membership.py
View File

@@ -63,7 +63,7 @@ class Membership(Document):
self.generate_invoice(with_payment_entry=settings.make_payment_entry, save=True) 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): 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")) frappe.throw(_("The payment for this membership is not paid. To generate invoice fill the payment details"))
@@ -140,7 +140,7 @@ class Membership(Document):
frappe.sendmail(**email_args) frappe.sendmail(**email_args)
def generate_and_send_invoice(self): def generate_and_send_invoice(self):
invoice = self.generate_invoice(False) invoice = self.generate_invoice(save=False)
self.send_acknowlement() self.send_acknowlement()
def make_invoice(membership, member, plan, settings): def make_invoice(membership, member, plan, settings):

10
erpnext/non_profit/doctype/membership/test_membership.py
View File

@@ -6,14 +6,14 @@ import unittest
import frappe import frappe
import erpnext import erpnext
from erpnext.non_profit.doctype.member.member import create_member 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 from erpnext.stock.doctype.item.test_item import create_item
class TestMembership(unittest.TestCase): class TestMembership(unittest.TestCase):
def setUp(self): def setUp(self):
# Get default company # Get default company
company = frappe.get_doc("Company", erpnext.get_default_company()) company = frappe.get_doc("Company", erpnext.get_default_company())
# update membership settings # update membership settings
settings = frappe.get_doc("Membership Settings") settings = frappe.get_doc("Membership Settings")
# Enable razorpay # Enable razorpay
@@ -58,11 +58,11 @@ class TestMembership(unittest.TestCase):
# Should work fine # Should work fine
make_membership(self.member, { "from_date": nowdate() }) make_membership(self.member, { "from_date": nowdate() })
make_membership(self.member, { "from_date": add_months(nowdate(), 1) }) make_membership(self.member, { "from_date": add_months(nowdate(), 1) })
from frappe.utils.user import add_role from frappe.utils.user import add_role
add_role("test@example.com", "Non Profit Manager") add_role("test@example.com", "Non Profit Manager")
frappe.set_user("test@example.com") frappe.set_user("test@example.com")
# create next membership with expiry not within 30 days # create next membership with expiry not within 30 days
self.assertRaises(frappe.ValidationError, make_membership, self.member, { self.assertRaises(frappe.ValidationError, make_membership, self.member, {
"from_date": add_months(nowdate(), 2), "from_date": add_months(nowdate(), 2),
@@ -70,7 +70,7 @@ class TestMembership(unittest.TestCase):
frappe.set_user("Administrator") frappe.set_user("Administrator")
# create the same membership but as administrator # create the same membership but as administrator
new_entry = make_membership(self.member, { make_membership(self.member, {
"from_date": add_months(nowdate(), 2), "from_date": add_months(nowdate(), 2),
"to_date": add_months(nowdate(), 3), "to_date": add_months(nowdate(), 3),
}) })