nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve more conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-08-21 10:04:20 +05:30
parent 2f92981afe
commit 72d9dc6c85
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@@ -1827,22 +1827,45 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
disable_dimension() disable_dimension()
def check_gl_entries(doc, voucher_no, expected_gle, posting_date): def check_gl_entries(
gl_entries = frappe.db.sql( doc,
"""select account, debit, credit, posting_date voucher_no,
from `tabGL Entry` expected_gle,
where voucher_type='Purchase Invoice' and voucher_no=%s and posting_date >= %s posting_date,
order by posting_date asc, account asc""", voucher_type="Purchase Invoice",
(voucher_no, posting_date), additional_columns=None,
as_dict=1, ):
gl = frappe.qb.DocType("GL Entry")
query = (
frappe.qb.from_(gl)
.select(gl.account, gl.debit, gl.credit, gl.posting_date)
.where(
(gl.voucher_type == voucher_type)
& (gl.voucher_no == voucher_no)
& (gl.posting_date >= posting_date)
& (gl.is_cancelled == 0)
)
.orderby(gl.posting_date, gl.account, gl.creation)
) )
if additional_columns:
for col in additional_columns:
query = query.select(gl[col])
gl_entries = query.run(as_dict=True)
for i, gle in enumerate(gl_entries): for i, gle in enumerate(gl_entries):
doc.assertEqual(expected_gle[i][0], gle.account) doc.assertEqual(expected_gle[i][0], gle.account)
doc.assertEqual(expected_gle[i][1], gle.debit) doc.assertEqual(expected_gle[i][1], gle.debit)
doc.assertEqual(expected_gle[i][2], gle.credit) doc.assertEqual(expected_gle[i][2], gle.credit)
doc.assertEqual(getdate(expected_gle[i][3]), gle.posting_date) doc.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
if additional_columns:
j = 4
for col in additional_columns:
doc.assertEqual(expected_gle[i][j], gle[col])
j += 1
def create_tax_witholding_category(category_name, company, account): def create_tax_witholding_category(category_name, company, account):
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year