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

fix: Added company field, filtered account heads

Browse Source 
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
This commit is contained in:
Subin Tom 2021-11-08 15:16:20 +05:30 committed by mergify-bot
parent 75e9100a53
commit e51c4ba8a9
4 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js
View File

@ -7,6 +7,23 @@ frappe.ui.form.on('TaxJar Settings', {
frm.toggle_reqd("sandbox_api_key", frm.doc.is_sandbox);
},
on_load: (frm) => {
frm.set_query('shipping_account_head', function() {
return {
filters: {
'company': frm.doc.current_company
}
};
});
frm.set_query('tax_account_head', function() {
return {
filters: {
'company': frm.doc.current_company
}
};
});
},
refresh: (frm) => {
frm.add_custom_button(__('Update Nexus List'), function() {
frm.call({

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

@ -14,6 +14,8 @@
"cb_keys",
"sandbox_api_key",
"configuration",
"current_company",
"column_break_10",
"tax_account_head",
"configuration_cb",
"shipping_account_head",
@ -67,10 +69,6 @@
"fieldtype": "Password",
"label": "Sandbox API Key"
},
{
"fieldname": "configuration_cb",
"fieldtype": "Column Break"
},
{
"default": "0",
"depends_on": "taxjar_calculate_tax",
@ -104,11 +102,25 @@
"label": "Nexus",
"options": "TaxJar Nexus",
"read_only": 1
},
{
"fieldname": "current_company",
"fieldtype": "Link",
"label": "Company",
"options": "Company"
},
{
"fieldname": "configuration_cb",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_10",
"fieldtype": "Column Break"
}
],
"issingle": 1,
"links": [],
"modified": "2021-10-06 10:59:13.475442",
"modified": "2021-11-08 14:40:15.684224",
"modified_by": "Administrator",
"module": "ERPNext Integrations",
"name": "TaxJar Settings",

6
erpnext/erpnext_integrations/taxjar_integration.py
View File

@ -19,6 +19,8 @@ SUPPORTED_STATE_CODES = ['AL', 'AK', 'AZ', 'AR', 'CA', 'CO', 'CT', 'DE', 'DC', '
'IN', 'IA', 'KS', 'KY', 'LA', 'ME', 'MD', 'MA', 'MI', 'MN', 'MS', 'MO', 'MT', 'NE',
'NV', 'NH', 'NJ', 'NM', 'NY', 'NC', 'ND', 'OH', 'OK', 'OR', 'PA', 'RI', 'SC', 'SD',
'TN', 'TX', 'UT', 'VT', 'VA', 'WA', 'WV', 'WI', 'WY']
USA_COMPANIES = frappe.get_all('Company', filters = {'country': 'United States'}, fields=['name'], pluck='name')
def get_client():
@ -158,6 +160,10 @@ def set_sales_tax(doc, method):
if not TAXJAR_CALCULATE_TAX:
return
taxjar_settings_company = frappe.db.get_single_value('TaxJar Settings','current_company')
if taxjar_settings_company not in USA_COMPANIES:
return
if not doc.items:
return

4
erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
View File

@ -28,6 +28,10 @@ def execute():
'Item': [
dict(fieldname='product_tax_category', fieldtype='Link', insert_after='item_group', options='Product Tax Category',
label='Product Tax Category')
],
'TaxJar Settings': [
dict(fieldname='current_company', fieldtype='Link', insert_after='configuration', options='Company',
label='Company')
]
}
create_custom_fields(custom_fields, update=True)