Ankush Menat
|
c07713b860
|
style: bulk format code with black
v13 port because otherwise backports will result in conflicts always
|
2022-03-29 17:29:34 +05:30 |
|
Subin Tom
|
46ed9a059c
|
fix: Taxjar minor fixes
(cherry picked from commit 1682a26fe6)
|
2022-02-22 14:08:52 +00:00 |
|
Subin Tom
|
7ad2717acc
|
fix: company condition fix, added company field
|
2021-11-08 18:03:44 +05:30 |
|
Subin Tom
|
7f2d304f32
|
fix: fixed company field, updated patch
|
2021-11-08 17:59:03 +05:30 |
|
Subin Tom
|
902c03cd37
|
fix: Added company field, filtered account heads
|
2021-11-08 15:16:20 +05:30 |
|
Subin Tom
|
904010ab64
|
fix: Fixed customer address variable, sales invoice item field currency issue
|
2021-11-08 09:49:11 +05:30 |
|
mergify[bot]
|
3af060c787
|
fix: TaxJar update - added nexus list, making api call only for nexus (backport #27497) (#27940)
* fix: TaxJar update - nexus, selective api call
(cherry picked from commit b01fe1c3e2)
* fix: sales_tax attribute in api call before submit
(cherry picked from commit 3bb60a439a)
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 0e527311b9)
* 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 486d7c3a39)
* 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 435a5e4fa3)
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 11bd42467e)
* fix: Renamed child table doctype, delete taxes for non nexus state
(cherry picked from commit 5c18654113)
* fix: updated patch, add fields only if fields are checked
(cherry picked from commit 54754f4eb8)
# Conflicts:
# erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
* fix: patch fix, fields disabling
(cherry picked from commit 0a28fed679)
* fix: using db.exists and get_value instead of get_doc
(cherry picked from commit 8675ca5bdd)
* fix: dt instead of document in set_value query
(cherry picked from commit d3bb920e71)
* minor fixes
(cherry picked from commit 254b20bc09)
* fix: improved on_update method, added validation for tax calculation, sandbox mode checks
(cherry picked from commit 7114659ecc)
* fix: linters fix
(cherry picked from commit 3ece05a9f7)
* fix: patch fix added reload_doctype
(cherry picked from commit eaa3614155)
* fix: patch fixes- force reload doc, check for company
(cherry picked from commit 1b25e69af4)
* fix: 'Taxjar' type fix
(cherry picked from commit ea2038489f)
* fix: Update pacthes.txt
(cherry picked from commit 5d4c919c5c)
* fix: Patch
(cherry picked from commit 2d19e2d54b)
# Conflicts:
# erpnext/patches.txt
* fix: Move product tax category folder to taxjar settings
(cherry picked from commit bd8cfb2e30)
* 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>
|
2021-10-19 13:38:50 +05:30 |
|
Ankush Menat
|
a6a564c43d
|
chore: whitespace (#27416)
|
2021-09-09 19:16:21 +05:30 |
|
Subin Tom
|
47c548a070
|
Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27143
|
2021-09-08 17:20:20 +05:30 |
|
Chillar Anand
|
4b2be2999f
|
chore: Cleanup imports (#27320)
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Remove imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Fix sider issues
* chore: linting
* chore: linting / sorting import
from ecommerce refactor merge
* ci: dont allow unused imports
* chore: sort / clean ecommerce imports
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
|
2021-09-03 18:57:43 +05:30 |
|
Subin Tom
|
ead1397a75
|
feat: Taxjar Integration update (#27143)
* feat: Taxjar Integration update
* added taxable_amount,taxable_amount fields in setup.py
* Update taxjar_integration.py
Sider issues fix
* Sider issues fix
* Sider issues fix
* sider issue fix: unused import
* sider issue fix
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* Removed permission for 'All'
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit 7004944cc0)
# Conflicts:
# erpnext/patches.txt
|
2021-08-31 13:04:37 +00:00 |
|
Sagar Vora
|
38e4635a10
|
fix: import taxjar globally in the taxjar_integration module
|
2020-11-29 20:26:26 +05:30 |
|
Deepesh Garg
|
dcb462f305
|
fix: Import pycountry and taxjar only if taxjar is enabled
|
2020-08-01 13:47:09 +05:30 |
|
vishdha
|
d3ec1c1d89
|
feat: Taxjar Integration Added
|
2020-06-24 16:37:21 +05:30 |
|