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 (backport #27497) #27940

Merged
merged 25 commits into from
Oct 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2021

This is an automatic backport of pull request #27497 done by Mergify.
Cherry-pick of 54754f4 has failed:

On branch mergify/bp/version-13-hotfix/pr-27497
Your branch is ahead of 'origin/version-13-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 54754f4eb8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
	modified:   erpnext/regional/united_states/setup.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py

Cherry-pick of 2d19e2d has failed:

On branch mergify/bp/version-13-hotfix/pr-27497
Your branch is ahead of 'origin/version-13-hotfix' by 18 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2d19e2d54b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

nemesis189 and others added 20 commits October 13, 2021 09:39
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 0e52731)
…ttings.py

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

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

# Conflicts:
#	erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
(cherry picked from commit 0a28fed)
(cherry picked from commit 254b20b)
… sandbox mode checks

(cherry picked from commit 7114659)
(cherry picked from commit 3ece05a)
(cherry picked from commit eaa3614)
(cherry picked from commit ea20384)
(cherry picked from commit 5d4c919)
(cherry picked from commit 2d19e2d)

# Conflicts:
#	erpnext/patches.txt
@AfshanKhan
Copy link
Contributor

@nemesis189 fix the conflicts

AfshanKhan and others added 3 commits October 19, 2021 11:41
removed extra line
einvoicing deprecation patch removed
@AfshanKhan AfshanKhan merged commit 3af060c into version-13-hotfix Oct 19, 2021
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-27497 branch October 19, 2021 08:09
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>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants