Feat: US Regional module, added test, changed address template reference to convention
This commit is contained in:
parent
fdb8e4d427
commit
7928a685c8
File diff suppressed because one or more lines are too long
4
erpnext/regional/united_states/address_template.html
Normal file
4
erpnext/regional/united_states/address_template.html
Normal file
@ -0,0 +1,4 @@
|
||||
{{ address_line1 }}<br>
|
||||
{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
|
||||
{{ city }}, {% if state %}{{ state }}{% endif -%}{% if pincode %} {{ pincode }}<br>{% endif -%}
|
||||
{% if country != "United States" %}{{ country|upper }}{% endif -%}
|
48
erpnext/regional/united_states/test_united_states.py
Normal file
48
erpnext/regional/united_states/test_united_states.py
Normal file
@ -0,0 +1,48 @@
|
||||
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
# License: GNU General Public License v3. See license.txt
|
||||
from __future__ import unicode_literals
|
||||
import frappe
|
||||
import unittest
|
||||
from erpnext.regional.report.irs_1099.irs_1099 import execute as execute_1099_report
|
||||
|
||||
|
||||
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)
|
||||
|
||||
def test_irs_1099_report(self):
|
||||
make_payment_entry_to_irs_1099_supplier()
|
||||
filters = frappe._dict({"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)
|
||||
|
||||
|
||||
def make_payment_entry_to_irs_1099_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_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()
|
Loading…
Reference in New Issue
Block a user