Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: TaxJar update - added nexus list, making api call only for nexus #27497

Merged
merged 20 commits into from
Oct 13, 2021

Conversation

nemesis189
Copy link
Contributor

@nemesis189 nemesis189 commented Sep 14, 2021

Update:

  • Added a child table to display nexus and retrieve data from it when required

  • API calls to retrieve tax from the taxjar api will be made only for nexus states

  • Button to update Nexus list in the TaxJar Settings page

  • sales_tax attribute attached in the API payload before creating the transaction

nemesis189 and others added 5 commits September 16, 2021 14:41
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
…ttings.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
…ttings.js

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
@nemesis189 nemesis189 marked this pull request as draft September 20, 2021 10:20
@nemesis189 nemesis189 removed the request for review from nextchamp-saqib October 6, 2021 16:07
Comment on lines +21 to +23
TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value("TaxJar Settings", "taxjar_create_transactions")
TAXJAR_CALCULATE_TAX = frappe.db.get_single_value("TaxJar Settings", "taxjar_calculate_tax")
TAXJAR_SANDBOX_MODE = frappe.db.get_single_value("TaxJar Settings", "is_sandbox")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if you need the db calls here, since you already have the context of the TaxJar Settings document

@deepeshgarg007 deepeshgarg007 marked this pull request as ready for review October 13, 2021 06:45
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2021

Command backport version-13-hotfix: pending

backport version-13-hotfix is pending

@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2021

Command backport version-13-hotfix: success

Backports have been created

AfshanKhan added a commit that referenced this pull request Oct 19, 2021
… (backport #27497) (#27940)

* fix: TaxJar update - nexus, selective api call

(cherry picked from commit b01fe1c)

* fix: sales_tax attribute in api call before submit

(cherry picked from commit 3bb60a4)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 0e52731)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 486d7c3)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 435a5e4)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 11bd424)

* fix: Renamed child table doctype, delete taxes for non nexus state

(cherry picked from commit 5c18654)

* fix: updated patch, add fields only if fields are checked

(cherry picked from commit 54754f4)

# Conflicts:
#	erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py

* fix: patch fix, fields disabling

(cherry picked from commit 0a28fed)

* fix: using db.exists and get_value instead of get_doc

(cherry picked from commit 8675ca5)

* fix: dt instead of document in set_value query

(cherry picked from commit d3bb920)

* minor fixes

(cherry picked from commit 254b20b)

* fix: improved on_update method, added validation for tax calculation, sandbox mode checks

(cherry picked from commit 7114659)

* fix: linters fix

(cherry picked from commit 3ece05a)

* fix: patch fix added reload_doctype

(cherry picked from commit eaa3614)

* fix: patch fixes- force reload doc, check for company

(cherry picked from commit 1b25e69)

* fix: 'Taxjar' type fix

(cherry picked from commit ea20384)

* fix: Update pacthes.txt

(cherry picked from commit 5d4c919)

* fix: Patch

(cherry picked from commit 2d19e2d)

# Conflicts:
#	erpnext/patches.txt

* fix: Move product tax category folder to taxjar settings

(cherry picked from commit bd8cfb2)

* Update custom_fields_for_taxjar_integration.py

* fix: conflicts

* fix: linter issues

removed extra line

* fix: patch fix

einvoicing deprecation patch removed

Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
fix: TaxJar update - added nexus list, making api call only for nexus
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
… (backport frappe#27497) (frappe#27940)

* fix: TaxJar update - nexus, selective api call

(cherry picked from commit 39fbfcb)

* fix: sales_tax attribute in api call before submit

(cherry picked from commit 7ddc460)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit a8e9e72)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit afce0d3)

* Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 569cf43)

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit ecb92e9)

* fix: Renamed child table doctype, delete taxes for non nexus state

(cherry picked from commit 3cbae8d)

* fix: updated patch, add fields only if fields are checked

(cherry picked from commit 6ddd55a)

# Conflicts:
#	erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py

* fix: patch fix, fields disabling

(cherry picked from commit 4536ab2)

* fix: using db.exists and get_value instead of get_doc

(cherry picked from commit 3337afe)

* fix: dt instead of document in set_value query

(cherry picked from commit 93a30f4)

* minor fixes

(cherry picked from commit 7ddc208)

* fix: improved on_update method, added validation for tax calculation, sandbox mode checks

(cherry picked from commit 17501ba)

* fix: linters fix

(cherry picked from commit dc20387)

* fix: patch fix added reload_doctype

(cherry picked from commit a183cfc)

* fix: patch fixes- force reload doc, check for company

(cherry picked from commit 1799b55)

* fix: 'Taxjar' type fix

(cherry picked from commit 076c83c)

* fix: Update pacthes.txt

(cherry picked from commit 64f92fe)

* fix: Patch

(cherry picked from commit 89ad53d)

# Conflicts:
#	erpnext/patches.txt

* fix: Move product tax category folder to taxjar settings

(cherry picked from commit adfa239)

* Update custom_fields_for_taxjar_integration.py

* fix: conflicts

* fix: linter issues

removed extra line

* fix: patch fix

einvoicing deprecation patch removed

Co-authored-by: Subin Tom <subintom2@gmail.com>
Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants