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

fix: company condition fix, added company field

Browse Source 
(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
This commit is contained in:
Subin Tom 2021-11-08 18:03:44 +05:30 committed by mergify-bot
parent d2915c6bc7
commit 45fd819729
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json
View File

@ -14,6 +14,7 @@
"cb_keys", "cb_keys",
"sandbox_api_key", "sandbox_api_key",
"configuration", "configuration",
"company",
"column_break_10", "column_break_10",
"tax_account_head", "tax_account_head",
"configuration_cb", "configuration_cb",
@ -109,11 +110,17 @@
{ {
"fieldname": "column_break_10", "fieldname": "column_break_10",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company"
} }
], ],
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-11-08 17:57:17.323275", "modified": "2021-11-08 18:02:29.232090",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "ERPNext Integrations", "module": "ERPNext Integrations",
"name": "TaxJar Settings", "name": "TaxJar Settings",

2
erpnext/erpnext_integrations/taxjar_integration.py
View File

@ -159,7 +159,7 @@ def set_sales_tax(doc, method):
if not TAXJAR_CALCULATE_TAX: if not TAXJAR_CALCULATE_TAX:
return return
if get_region(doc.company): if get_region(doc.company) != 'United States':
return return
if not doc.items: if not doc.items: