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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-25 19:04:20 +05:30
parent 761669c7ca
commit f724f6d1bb
9 changed files with 48 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,9 @@ 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 import get_company_currency
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):
@@ -202,35 +199,17 @@ class Membership(Document):
def make_invoice(membership, member, plan, settings):
<<<<<<< HEAD
invoice = frappe.get_doc(
{
"doctype": "Sales Invoice",
"customer": member.customer,
"debit_to": settings.membership_debit_account,
"currency": membership.currency,
"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}],
}
)
=======
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()