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

fix: Fixed customer address variable, sales invoice item field currency issue

Browse Source 
(cherry picked from commit 904010ab64)
This commit is contained in:
Subin Tom
2021-11-08 09:49:11 +05:30
committed by mergify-bot
parent 35bd31e939
commit 3d1b833f35
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
View File

@@ -82,9 +82,9 @@ def make_custom_fields(update=True):
dict(fieldname='product_tax_category', fieldtype='Link', insert_after='description', options='Product Tax Category', dict(fieldname='product_tax_category', fieldtype='Link', insert_after='description', options='Product Tax Category',
label='Product Tax Category', fetch_from='item_code.product_tax_category'), label='Product Tax Category', fetch_from='item_code.product_tax_category'),
dict(fieldname='tax_collectable', fieldtype='Currency', insert_after='net_amount', dict(fieldname='tax_collectable', fieldtype='Currency', insert_after='net_amount',
label='Tax Collectable', read_only=1), label='Tax Collectable', read_only=1, options='currency'),
dict(fieldname='taxable_amount', fieldtype='Currency', insert_after='tax_collectable', dict(fieldname='taxable_amount', fieldtype='Currency', insert_after='tax_collectable',
label='Taxable Amount', read_only=1) label='Taxable Amount', read_only=1, options='currency')
], ],
'Item': [ 'Item': [
dict(fieldname='product_tax_category', fieldtype='Link', insert_after='item_group', options='Product Tax Category', dict(fieldname='product_tax_category', fieldtype='Link', insert_after='item_group', options='Product Tax Category',

2
erpnext/erpnext_integrations/taxjar_integration.py
View File

@@ -262,7 +262,7 @@ def get_shipping_address_details(doc):
if doc.shipping_address_name: if doc.shipping_address_name:
shipping_address = frappe.get_doc("Address", doc.shipping_address_name) shipping_address = frappe.get_doc("Address", doc.shipping_address_name)
elif doc.customer_address: elif doc.customer_address:
shipping_address = frappe.get_doc("Address", doc.customer_address_name) shipping_address = frappe.get_doc("Address", doc.customer_address)
else: else:
shipping_address = get_company_address_details(doc) shipping_address = get_company_address_details(doc)

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

@@ -23,9 +23,9 @@ def execute():
dict(fieldname='product_tax_category', fieldtype='Link', insert_after='description', options='Product Tax Category', dict(fieldname='product_tax_category', fieldtype='Link', insert_after='description', options='Product Tax Category',
label='Product Tax Category', fetch_from='item_code.product_tax_category'), label='Product Tax Category', fetch_from='item_code.product_tax_category'),
dict(fieldname='tax_collectable', fieldtype='Currency', insert_after='net_amount', dict(fieldname='tax_collectable', fieldtype='Currency', insert_after='net_amount',
label='Tax Collectable', read_only=1), label='Tax Collectable', read_only=1, options='currency'),
dict(fieldname='taxable_amount', fieldtype='Currency', insert_after='tax_collectable', dict(fieldname='taxable_amount', fieldtype='Currency', insert_after='tax_collectable',
label='Taxable Amount', read_only=1) label='Taxable Amount', read_only=1, options='currency')
], ],
'Item': [ 'Item': [
dict(fieldname='product_tax_category', fieldtype='Link', insert_after='item_group', options='Product Tax Category', dict(fieldname='product_tax_category', fieldtype='Link', insert_after='item_group', options='Product Tax Category',