nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-08-14 10:37:56 +05:30
parent 61afffc908
commit 7469018d3e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@@ -58,9 +58,6 @@ class GLEntry(Document):
validate_balance_type(self.account, adv_adj) validate_balance_type(self.account, adv_adj)
validate_frozen_account(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 ( if (
self.voucher_type == "Journal Entry" self.voucher_type == "Journal Entry"
and frappe.get_cached_value("Journal Entry", self.voucher_no, "voucher_type") and frappe.get_cached_value("Journal Entry", self.voucher_no, "voucher_type")
@@ -69,7 +66,6 @@ class GLEntry(Document):
return return
if frappe.get_cached_value("Account", self.account, "account_type") not in [ if frappe.get_cached_value("Account", self.account, "account_type") not in [
>>>>>>> f119a1e115 (refactor: linkage between journal as payment and gain/loss journal)
"Receivable", "Receivable",
"Payable", "Payable",
]: ]: