Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16826 from deepeshgarg007/test_fix

Browse Source 
fix: Account type fix in test_united_states
This commit is contained in:
Aditya Hase 2019-03-04 14:21:54 +05:30 committed by GitHub
commit 711ac5ae24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/report/irs_1099/irs_1099.py
View File

@ -26,7 +26,7 @@ def execute(filters=None):
s.supplier_group as "supplier_group",
gl.party AS "supplier",
s.tax_id as "tax_id",
SUM(gl.debit) AS "payments"
SUM(gl.debit_in_account_currency) AS "payments"
FROM
`tabGL Entry` gl INNER JOIN `tabSupplier` s
WHERE

38
erpnext/regional/united_states/test_united_states.py
View File

@ -8,41 +8,49 @@ from erpnext.regional.report.irs_1099.irs_1099 import execute as execute_1099_re
class TestUnitedStates(unittest.TestCase):
def test_irs_1099_custom_field(self):
doc = frappe.new_doc("Supplier")
doc.supplier_name = "_US 1099 Test Supplier"
doc.supplier_group = "Services"
doc.supplier_type = "Company"
doc.country = "United States"
doc.tax_id = "04-1234567"
doc.irs_1099 = 1
doc.save()
frappe.db.commit()
supplier = frappe.get_doc('Supplier', "_US 1099 Test Supplier")
self.assertEqual(supplier.irs_1099, 1)
if not frappe.db.exists("Supplier", "_US 1099 Test Supplier"):
doc = frappe.new_doc("Supplier")
doc.supplier_name = "_US 1099 Test Supplier"
doc.supplier_group = "Services"
doc.supplier_type = "Company"
doc.country = "United States"
doc.tax_id = "04-1234567"
doc.irs_1099 = 1
doc.save()
frappe.db.commit()
supplier = frappe.get_doc('Supplier', "_US 1099 Test Supplier")
self.assertEqual(supplier.irs_1099, 1)
def test_irs_1099_report(self):
make_payment_entry_to_irs_1099_supplier()
filters = frappe._dict({"fiscal_year": "2016", "company": "_Test Company"})
filters = frappe._dict({"fiscal_year": "_Test Fiscal Year 2016", "company": "_Test Company"})
columns, data = execute_1099_report(filters)
print(columns, data)
expected_row = {'supplier': '_US 1099 Test Supplier',
'supplier_group': 'Services',
'payments': 100.0,
'tax_id': '04-1234567'}
self.assertEqual(data, expected_row)
self.assertEqual(data[0], expected_row)
def make_payment_entry_to_irs_1099_supplier():
frappe.db.sql("delete from `tabGL Entry` where party='_US 1099 Test Supplier'")
frappe.db.sql("delete from `tabGL Entry` where against='_US 1099 Test Supplier'")
frappe.db.sql("delete from `tabPayment Entry` where party='_US 1099 Test Supplier'")
pe = frappe.new_doc("Payment Entry")
pe.payment_type = "Pay"
pe.company = "_Test Company"
pe.posting_date = "2016-01-10"
pe.paid_from = "_Test Bank USD - _TC"
pe.paid_to = "_Test Bank - _TC"
pe.paid_to = "_Test Payable USD - _TC"
pe.paid_amount = 100
pe.received_amount = 100
pe.reference_no = "For IRS 1099 testing"
pe.reference_date = "2016-01-10"
pe.party_type = "Supplier"
pe.party = "_US 1099 Test Supplier"
pe.save()
pe.insert()
pe.submit()