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
Marica
7c09a79dd4
Merge branch 'version-13-hotfix' into e-commerce-refactor
2021-09-02 10:25:14 +05:30
Ankush Menat
187c3f9630
fix: invalid escape sequences in regex
2021-09-01 20:20:32 +05:30
Ankush Menat
76f1ed624a
fix: remove bare excepts
2021-09-01 20:15:54 +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
2021-08-31 13:04:37 +00:00
marination
fd44b6b340
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
2021-08-30 22:30:02 +05:30
Frappe PR Bot
03039b9e00
fix: use Stripe's Price API for plan-price information ( #27183 )
...
* fix: use Stripe's Price API for plan-price information (#26107 )
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit 16eed07a0fAlchez@users.noreply.github.com >
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com >
2021-08-27 10:45:34 +05:30
Frappe PR Bot
8dae084f23
chore: remove deprecated and empty QUnit tests ( #27179 ) ( #27181 )
...
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
(cherry picked from commit ae55eab599ankush@iwebnotes.com >
2021-08-26 21:08:08 +05:30
marination
280f615ded
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
2021-08-24 11:48:13 +05:30
Ankush Menat
9bb69e711a
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
marination
d477b99c1d
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
2021-08-09 13:41:45 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
marination
2107883301
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
2021-07-08 11:12:14 +05:30
Deepesh Garg
9b6d9a41f4
fix: Test Cases
2021-07-05 17:08:27 +05:30
Deepesh Garg
15b336df28
fix: Test cases
2021-07-05 14:45:33 +05:30
Deepesh Garg
db682d9e4c
fix: Create mode of payment if doesn't exists
2021-07-05 13:46:03 +05:30
Deepesh Garg
a0599e5ac2
fix: Test cases for M-pesa
2021-07-05 10:09:42 +05:30
marination
e000be5145
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
2021-06-01 12:49:55 +05:30
Saqib Ansari
bbce2e91a3
fix: reset plaid link button
2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623
fix(plaid): cannot reset plaid link for a bank account
2021-05-28 11:36:24 +05:30
Suraj Shetty
19c5fd72d6
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-28 09:10:33 +05:30
Marica
ea4ec3bc7c
Merge branch 'version-13-hotfix' into e-commerce-refactor
2021-05-27 19:03:55 +05:30
Laurynas Sakalauskas
6a62ad325f
fix(plaid): withdrawals and deposits are recorded incorrectly ( #25784 )
2021-05-25 19:09:44 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase ( #25062 )
...
* remove uses of six.py2 in codebase
* changes based on pr feedback
* Update amazon_mws_api.py
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-05-23 21:13:44 +05:30
marination
a0bbe7fea7
fix: Sider and Patches
...
- Sider fixes
- Deleted patches that worked as per old schema
- Cleared instances of web fields linked to Item master
2021-05-17 21:27:42 +05:30
rohitwaghchaure
0612300631
Merge pull request #25688 from rohitwaghchaure/fixed-woocommerce-order-sync-issue
...
fix: Woocommerce order sync issue
2021-05-12 23:07:46 +05:30
Rohit Waghchaure
c3c54fe058
fix: Woocommerce order sync issue
2021-05-12 19:42:04 +05:30
Deepesh Garg
a665f14620
fix: Error on adding bank account to plaid ( #25658 )
2021-05-11 17:33:59 +05:30
Ankush Menat
6e179c3092
fix: sync shopify customer addresses ( #25481 )
2021-05-10 13:24:26 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual ( #25613 )
...
* chore: replace assertEquals with alias assertEqual
assertEquals has been deprecated.
ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases
* chore: sider fixes
2021-05-07 20:28:51 +05:30
Ankush Menat
e28165ea87
fix: force https for shopify webhook registration ( #25630 )
2021-05-07 20:27:51 +05:30
Ankush Menat
996f7e53a1
fix: update shopify api version ( #25600 )
2021-05-07 12:14:14 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods ( #25465 )
2021-04-24 14:23:08 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Sagar Vora
27f48739d4
test: pass force parameter to avoid LinkExistsError ( #25100 )
2021-03-31 18:49:03 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech >
2021-03-31 12:30:32 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError ( #24936 )
2021-03-18 16:36:40 +05:30
Sagar Vora
c5869d5b47
test: fix import_doc call in test_shopify_settings
2021-03-12 16:21:45 +05:30
Ankush Menat
7d892438f0
fix: track setting changes
2021-03-02 17:50:58 +05:30
Mohammad Hasnain Mohsin Rajan
8cdba8ab64
fix: ams integration breaks when error raised ( #24383 )
2021-02-25 18:36:19 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2021-02-22 22:19:47 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API ( #24531 )
2021-02-15 11:58:27 +05:30
Saqib
0681a480c2
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-11 14:06:15 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
Rohan
b1d08126b0
feat: add "Sync Now" to Plaid Settings ( #23602 )
2021-01-15 12:56:30 +05:30
