| commit | 4a538ba78a8e963c6b1d437ff1fe638f964adf86 | [log] [tgz] |
|---|---|---|
| author | Anurag Mishra <mishranaman123@gmail.com> | Mon Mar 11 12:30:21 2019 +0530 |
| committer | Anurag Mishra <mishranaman123@gmail.com> | Thu Mar 14 16:43:16 2019 +0530 |
| tree | efe8082e3373b7a9377b200ec53fb60f8d0f190f | |
| parent | ed965916187fb71adeb5787f2098bb516669275d [diff] |
Resolve merge conflict
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py index 69cd5f6..b047c31 100644 --- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py +++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
@@ -34,7 +34,7 @@ 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")