From 7469018d3e0dd6359ba3dbf2ec3844c32b5c01a9 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 14 Aug 2023 10:37:56 +0530 Subject: [PATCH] chore: resolve merge conflict --- erpnext/accounts/doctype/gl_entry/gl_entry.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 26f4f2ba75f..3a564825b55 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -58,9 +58,6 @@ class GLEntry(Document): validate_balance_type(self.account, adv_adj) validate_frozen_account(self.account, adv_adj) -<<<<<<< HEAD - if frappe.db.get_value("Account", self.account, "account_type") not in [ -======= if ( self.voucher_type == "Journal Entry" and frappe.get_cached_value("Journal Entry", self.voucher_no, "voucher_type") @@ -69,7 +66,6 @@ class GLEntry(Document): return if frappe.get_cached_value("Account", self.account, "account_type") not in [ ->>>>>>> f119a1e115 (refactor: linkage between journal as payment and gain/loss journal) "Receivable", "Payable", ]: