nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 16:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Update test cases for currency change validation

Browse Source 
(cherry picked from commit 60915e874d)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
#	erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
#	erpnext/non_profit/doctype/membership/membership.py
This commit is contained in:
Deepesh Garg
2021-08-21 23:05:48 +05:30
committed by Mergify
parent 9d43a90eb0
commit 8f969fbd66
6 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,12 @@ from frappe.model.document import Document
from frappe.utils import add_days, add_months, add_years, get_link_to_form, getdate, nowdate
import erpnext
<<<<<<< HEAD
from erpnext.non_profit.doctype.member.member import create_member
=======
from erpnext import get_company_currency
>>>>>>> 60915e874d (test: Update test cases for currency change validation)
class Membership(Document):
def validate(self):
@@ -198,6 +202,7 @@ class Membership(Document):
def make_invoice(membership, member, plan, settings):
<<<<<<< HEAD
invoice = frappe.get_doc(
{
"doctype": "Sales Invoice",
@@ -209,6 +214,23 @@ def make_invoice(membership, member, plan, settings):
"items": [{"item_code": plan.linked_item, "rate": membership.amount, "qty": 1}],
}
)
=======
invoice = frappe.get_doc({
"doctype": "Sales Invoice",
"customer": member.customer,
"debit_to": settings.membership_debit_account,
"currency": membership.currency or get_company_currency(settings.company),
"company": settings.company,
"is_pos": 0,
"items": [
{
"item_code": plan.linked_item,
"rate": membership.amount,
"qty": 1
}
]
})
>>>>>>> 60915e874d (test: Update test cases for currency change validation)
invoice.set_missing_values()
invoice.insert()
invoice.submit()

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

@@ -94,7 +94,7 @@ def make_membership(member, payload={}):
"member": member,
"membership_status": "Current",
"membership_type": "_rzpy_test_milythm",
"currency": "INR",
"currency": "USD",
"paid": 1,
"from_date": nowdate(),
"amount": 100,