nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 04:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Anurag Mishra
2019-03-11 12:30:21 +05:30
parent ed96591618
commit 4a538ba78a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
View File

@@ -34,7 +34,7 @@ class InvoiceDiscounting(AccountsController):
if self.docstatus == 1:
self.status = "Sanctioned"
elif self.docstatus == 2:
self.status: "Cancelled"
self.status = "Cancelled"
def make_gl_entries(self):
company_currency = frappe.get_cached_value('Company', self.company, "default_currency")