schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve merge conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-03-02 15:59:48 +05:30
parent 46063518d7
commit 753223da78
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -485,13 +485,8 @@ class JournalEntry(AccountsController):
def validate_against_jv(self): def validate_against_jv(self):
for d in self.get("accounts"): for d in self.get("accounts"):
if d.reference_type == "Journal Entry": if d.reference_type == "Journal Entry":
<<<<<<< HEAD
account_root_type = frappe.db.get_value("Account", d.account, "root_type")
if account_root_type == "Asset" and flt(d.debit) > 0:
=======
account_root_type = frappe.get_cached_value("Account", d.account, "root_type") account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
if account_root_type == "Asset" and flt(d.debit) > 0 and not self.system_generated_gain_loss(): if account_root_type == "Asset" and flt(d.debit) > 0 and not self.system_generated_gain_loss():
>>>>>>> 5b67631d40 (fix: allow gain/loss for Journals against Journals)
frappe.throw( frappe.throw(
_( _(
"Row #{0}: For {1}, you can select reference document only if account gets credited" "Row #{0}: For {1}, you can select reference document only if account gets credited"

3
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -1506,9 +1506,7 @@ class TestAccountsController(FrappeTestCase):
pluck="department", pluck="department",
), ),
) )
<<<<<<< HEAD
self.disable_dimensions() self.disable_dimensions()
=======
def test_50_journal_against_journal(self): def test_50_journal_against_journal(self):
# Invoice in Foreign Currency # Invoice in Foreign Currency
@@ -1576,4 +1574,3 @@ class TestAccountsController(FrappeTestCase):
exc_je_for_je = self.get_journals_for(journal_as_payment.doctype, journal_as_payment.name) exc_je_for_je = self.get_journals_for(journal_as_payment.doctype, journal_as_payment.name)
self.assertEqual(exc_je_for_si, []) self.assertEqual(exc_je_for_si, [])
self.assertEqual(exc_je_for_je, []) self.assertEqual(exc_je_for_je, [])
>>>>>>> 8a5078b826 (test: gain/loss on Journals against Journals)