Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,337 Commits 3 Branches 0 Tags 1 GiB
79fa562004
Commit Graph

333 Commits

Author SHA1 Message Date
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519) 
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
 2021-11-23 15:08:51 +05:30
marination
8c20f66905 fix: Sider and Patches 
- Sider fixes
- Deleted patches that worked as per old schema
- Cleared instances of web fields linked to Item master
 2021-11-16 16:34:24 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally (#28372) 2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc (#28369) 2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests (#28367) 2021-11-12 14:08:02 +05:30
Subin Tom
45fd819729 fix: company condition fix, added company field 
(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
 2021-11-08 13:12:28 +00:00
Subin Tom
d2915c6bc7 fix: fixed company field, updated patch 
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)

# Conflicts:
#	erpnext/patches.txt
 2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9 fix: Added company field, filtered account heads 
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
 2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53 fix: Fixed customer address variable, sales invoice item field currency issue 
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
 2021-11-08 13:12:25 +00:00
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request #27497 from nemesis189/taxjar-nexus-update 
fix: TaxJar update - added nexus list, making api call only for nexus
 2021-10-13 15:08:48 +05:30
Deepesh Garg
bd8cfb2e30 fix: Move product tax category folder to taxjar settings 2021-10-13 13:40:53 +05:30
Subin Tom
3ece05a9f7 fix: linters fix 2021-10-06 21:35:04 +05:30
Subin Tom
7114659ecc fix: improved on_update method, added validation for tax calculation, sandbox mode checks 2021-10-06 21:31:19 +05:30
Subin Tom
254b20bc09 minor fixes 2021-09-29 13:34:50 +05:30
Subin Tom
d3bb920e71 fix: dt instead of document in set_value query 2021-09-29 11:26:04 +05:30
Subin Tom
8675ca5bdd fix: using db.exists and get_value instead of get_doc 2021-09-29 11:11:55 +05:30
Subin Tom
0a28fed679 fix: patch fix, fields disabling 2021-09-28 13:54:01 +05:30
Subin Tom
54754f4eb8 fix: updated patch, add fields only if fields are checked 2021-09-27 12:51:54 +05:30
Saqib
ef66beec51
fix(plaid): query to check if bank account exists 2021-09-20 15:33:29 +05:30
Subin Tom
5c18654113 fix: Renamed child table doctype, delete taxes for non nexus state 2021-09-17 00:10:41 +05:30
Subin Tom
11bd42467e
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:15 +05:30
Subin Tom
435a5e4fa3
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:06 +05:30
Subin Tom
486d7c3a39
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:48 +05:30
Subin Tom
0e527311b9
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:38 +05:30
Subin Tom
3bb60a439a fix: sales_tax attribute in api call before submit 2021-09-14 22:04:57 +05:30
Subin Tom
b01fe1c3e2 fix: TaxJar update - nexus, selective api call 2021-09-14 20:42:47 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Subin Tom
7004944cc0
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>
 2021-08-31 18:33:16 +05:30
Rohan
16eed07a0f
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>
 2021-08-26 21:47:00 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* 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.
 2021-08-26 20:43:06 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext (#26700) 
BREAKING CHANGE: remove Shopify integration.

The integration is moved to a separate app with additional enhancements.

The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.

New app: https://github.com/frappe/ecommerce_integrations
 2021-08-02 21:57:52 +05:30
Deepesh Garg
2de11fbbc4 fix: Test Cases 2021-07-13 16:50:35 +05:30
Deepesh Garg
3ef394c556 fix: Test cases 2021-07-13 16:50:35 +05:30
Deepesh Garg
b2af6b4583 fix: Create mode of payment if doesn't exists 2021-07-13 16:50:35 +05:30
Deepesh Garg
8f6f86aff4 fix: Test cases for M-pesa 2021-07-13 16:50:35 +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
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
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
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Rohit Waghchaure
67dfe5db0d fix: shipping chanrges not sync in erpnext from shopify 2020-12-12 15:59:17 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
jbienesdev
ac3c1f1493 chore: remove packlink, letmeship, and sendcloud files 2020-12-02 07:15:11 +00:00
jbienesdev
000494f548 fix(shipment): apply code review 2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8 feat(shipment): Shipment Doctype with Integrations 2020-12-02 07:14:58 +00:00
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Deepesh Garg
7b16c55c9a feat: Sync old shopify orders (#23841) 
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-11-30 14:58:00 +05:30
Sagar Vora
38e4635a10 fix: import taxjar globally in the taxjar_integration module 2020-11-29 20:26:26 +05:30
Deepesh Garg
43a830f3f5 fix: Old shopify order syncing date 2020-11-24 15:10:36 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders (#23841) 
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-11-13 16:53:35 +05:30
Mangesh-Khairnar
2df2b2f351
fix: update integrations desk page (#23767) 
* fix: update integrations desk page

* fix: setup dashboard after receiving API callback

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-11-04 12:48:33 +05:30
Mangesh-Khairnar
1354aecafa
fix: add check for allowing access to european region (#23770) 2020-11-04 12:42:02 +05:30
Mangesh-Khairnar
e03a02d9c0 fix: show descriptive message for missing fields 2020-10-23 13:38:55 +05:30
Nabin Hait
ed1553ea81
Merge branch 'develop' into mpesa-integration 2020-10-22 21:45:03 +05:30
Michelle Alva
52514a30d7
feat: Add Integrations Settings in desk (#22857) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-10-22 09:52:34 +05:30
Mangesh-Khairnar
1a6d82a447 fix(payment-request): only consider paid transactions 2020-10-22 01:07:49 +05:30
Mangesh-Khairnar
c8a04fec35 fix(mpesa-settings): add test cases to verify transactions 2020-10-21 14:07:00 +05:30
Mangesh-Khairnar
c66fce4965 fix: reload current pos doc after updating the information via callback 2020-10-16 12:03:08 +05:30
Mangesh-Khairnar
cab5d22ef5 fix: add a realtime publish to refresh the dashboard content 2020-10-16 11:38:07 +05:30
Mangesh-Khairnar
51228b5ee3 fix: make response handling more descriptive 2020-10-13 17:10:16 +05:30