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 customer_address fix, currency fix (backport #28262) #28277

Merged
merged 5 commits into from
Nov 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2021

This is an automatic backport of pull request #28262 done by Mergify.
Cherry-pick of 7f2d304 has failed:

On branch mergify/bp/develop/pr-28262
Your branch is ahead of 'origin/develop' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7f2d304f32.
  (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.js
	modified:   erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json
	modified:   erpnext/erpnext_integrations/taxjar_integration.py
	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.com

(cherry picked from commit 7f2d304)

# Conflicts:
#	erpnext/patches.txt
@codecov
Copy link

codecov bot commented Nov 8, 2021

Codecov Report

Merging #28277 (94d70bc) into develop (2bf3b0f) will decrease coverage by 0.06%.
The diff coverage is 25.00%.

@@             Coverage Diff             @@
##           develop   #28277      +/-   ##
===========================================
- Coverage    55.25%   55.18%   -0.07%     
===========================================
  Files         1117     1117              
  Lines        66492    66494       +2     
===========================================
- Hits         36738    36696      -42     
- Misses       29754    29798      +44     
Impacted Files Coverage Δ
...rations/doctype/taxjar_settings/taxjar_settings.py 28.33% <ø> (ø)
erpnext/erpnext_integrations/taxjar_integration.py 18.53% <25.00%> (-0.22%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 68.96% <0.00%> (-24.14%) ⬇️
...payroll/doctype/income_tax_slab/income_tax_slab.py 83.33% <0.00%> (-16.67%) ⬇️
...t/payroll/doctype/payroll_period/payroll_period.py 64.81% <0.00%> (-5.56%) ⬇️
...eport/item_variant_details/item_variant_details.py 84.33% <0.00%> (-3.62%) ⬇️
erpnext/education/doctype/student/student.py 73.68% <0.00%> (-3.16%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 92.40% <0.00%> (-2.54%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 44.00% <0.00%> (-2.00%) ⬇️
erpnext/portal/utils.py 28.98% <0.00%> (-1.45%) ⬇️
... and 15 more

@deepeshgarg007 deepeshgarg007 merged commit 2da1703 into develop Nov 8, 2021
@mergify mergify bot deleted the mergify/bp/develop/pr-28262 branch November 8, 2021 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants