From 4a538ba78a8e963c6b1d437ff1fe638f964adf86 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Mon, 11 Mar 2019 12:30:21 +0530 Subject: [PATCH] Resolve merge conflict --- .../accounts/doctype/invoice_discounting/invoice_discounting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py index 69cd5f63f8..b047c31b1a 100644 --- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py +++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py @@ -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")