Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,391 Commits 3 Branches 0 Tags 1 GiB
881301ca9b
Commit Graph

247 Commits

Author SHA1 Message Date
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
Mangesh-Khairnar
faa0cce7a7 fix: pass mobile number to generate the stk push 2020-10-06 13:58:54 +05:30
Mangesh-Khairnar
862433febb fix: create custom field for mpesa receipt 2020-10-06 10:59:59 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Mangesh-Khairnar
8d12c3841f fix: process transaction callback 2020-09-28 19:40:42 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Mangesh-Khairnar
a26c6b4c2d fix: fetch account balance info 2020-09-25 23:56:39 +05:30
Mangesh-Khairnar
97ab96c8bf fix: handle api changes from callbacks 2020-09-22 12:58:32 +05:30
Mangesh-Khairnar
e3c6128638
fix(plaid): do not send null list in account ids (#23376) 2020-09-21 18:50:22 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) (#23318) 
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-09-21 13:14:07 +05:30
Mangesh-Khairnar
a3ac4bf681 fix: create payment request via pos 2020-09-18 19:47:33 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Mangesh-Khairnar
27f81e06ea fix: create custom pos fields 2020-09-15 14:38:06 +05:30
Mangesh-Khairnar
2dabd2182f feat: add mpesa integration 2020-09-10 17:05:43 +05:30
Mangesh-Khairnar
e292fd6c58 feat: add integrations desk page 2020-08-24 00:45:13 +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
Shivam Mishra
34d2bfbb3e
refactor: handle exceptions when updating addresses (#22307) 
* refactor: handle exceptions when updating addresses

* refactor: fold common statements in a loop
 2020-06-18 15:28:55 +05:30
Mangesh-Khairnar
53b601523b
fix: update shopify api version (#22284) 
Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-06-17 19:31:57 +05:30
Mangesh-Khairnar
3031128167
fix: fetch tax lines within the shipping lines (#22138) 2020-06-07 18:02:23 +05:30
gavin
7a05662e9f
Merge pull request #21491 from gavindsouza/tally-migration-feat 
feat(Tally migration): Errored documents handling
 2020-06-02 13:03:13 +05:30
Mangesh-Khairnar
c302d066a3
fix: only save end date when transactions are returned (#22023) 2020-05-29 10:19:58 +05:30
Mangesh-Khairnar
706524f1ae
fix: make transaction date of the oldest transaction as the last integration date (#22000) 
* fix: make transaction date of the oldest transaction as the last integration date

* chore: remove blank line after docstring
 2020-05-28 13:33:58 +05:30
Michelle Alva
8653419c4c
fix: change modified time 
changed modified time to sync the changes
 2020-05-28 12:52:58 +05:30
Michelle Alva
f7beeff2d8
fix: change description for field (#21995) 
grammatical fixes for description of Default Customer
 2020-05-28 11:05:19 +05:30
Mangesh-Khairnar
7402451b96
fix: shopify error message on failure of sales order creation (#21924) 2020-05-26 17:56:40 +05:30
Mangesh-Khairnar
ddc170521f
fix: check for warehouse in the woocommerce settings (#21925) 2020-05-26 17:55:56 +05:30
Shivam Mishra
d3d3836943
style: cleaner conditions and returns 2020-05-19 11:53:28 +05:30
Shivam Mishra
bdc97e6b48
Merge branch 'develop' into woocommerce-shipping 2020-05-16 19:40:45 +05:30
Shivam Mishra
d69e3eb5d7 feat: use name instead of customer name to link address and contact 2020-05-16 19:37:03 +05:30
Shivam Mishra
180bda7618 refactor: return address and contact objects 2020-05-16 19:20:55 +05:30
Shivam Mishra
fc514ba940 feat: save contact to woocommerce 2020-05-16 19:19:18 +05:30
Mangesh-Khairnar
4a9fd9ef6d fix: error log title for failing bank transactions 2020-05-13 16:11:22 +05:30
Gavin D'souza
cb1376b036 chore: verbose error message for coa recursion 2020-05-09 12:05:33 +05:30
Shivam Mishra
da41724d9d feat: save shipping address to woocommerce customer 2020-05-08 15:12:08 +05:30
Gavin D'souza
0c353a64a4 fix: un-using buggy JS frappe.new_doc 2020-05-02 18:58:33 +05:30
Gavin D'souza
af612ddb6d feat: maintain tally voucher numbers 
feat: create seperate customer and supplier entries for same party if
case exists
 2020-05-01 14:39:11 +05:30
Gavin D'souza
51305a028b feat: prompt that company and COA will be overwritten 2020-05-01 14:37:28 +05:30
gavin
c333797d67
Merge branch 'develop' into tally-migration-feat 2020-04-29 13:10:28 +05:30
Gavin D'souza
f4926a8205 fix: toggle read only for accounts post daybook data processing 
style: code comments and updates
 2020-04-29 11:21:16 +05:30
Gavin D'souza
6b850b7e71 perf: reduce JS memory heap and maintain namespaces 2020-04-29 10:25:18 +05:30
Gavin D'souza
0d61b35b0b fix: table cleanups, updated summary block 2020-04-28 18:13:10 +05:30
Gavin D'souza
27b7172fa4 fix: run summary logger 
style: indent fixes
 2020-04-28 16:32:15 +05:30
Gavin D'souza
2e1b531f4f feat: handle resolve and unresolved errors 
restructured and reused components
 2020-04-28 16:04:49 +05:30
Gavin D'souza
640636bbcd feat: maintain logs of errors successfully fixed 2020-04-28 16:01:59 +05:30
Gavin D'souza
1b5eea691c feat: order failed import log by creation, handle rollbacks and commits 2020-04-28 15:51:40 +05:30
Gavin D'souza
0805307514 perf: reduce failed_error_log size 2020-04-27 13:42:00 +05:30
Gavin D'souza
82e7a9de28 feat: error log handling 
fix: toggle required accounts
 2020-04-27 13:12:38 +05:30
Gavin D'souza
38c677689d fix: set default round off acount 2020-04-27 11:50:16 +05:30
Gavin D'souza
2de4a5a7c8 feat: Error logging via doc 
fix: Handle duplicate company and COA
feat: Error logging via doc
feat: fetch defaults for accounts
 2020-04-27 11:34:00 +05:30
Gavin D'souza
defeb73747 feat: Add Failed error logs 
fix: set defaults
 2020-04-27 11:32:49 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-25 14:52:05 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179) 
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-23 12:19:30 +05:30
gavin
25932e0613
Merge pull request #21298 from gavindsouza/tally-migration-fixes 
fix: Tally migration
 2020-04-17 19:12:55 +05:30
Gavin D'souza
496c6a3baa style: removed unused imports and updated formatting 2020-04-16 16:51:59 +05:30
Gavin D'souza
6abdfc586b fix: strip data fields of whitespaces 2020-04-16 16:14:29 +05:30
Gavin D'souza
72a94941bf fix(tally-migration): DocType improvement 2020-04-16 16:12:40 +05:30
Gavin D'souza
2ad7e81560 fix: handle errors in enqueued methods and update status 2020-04-16 16:11:55 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace (#21196) 
* fix(MWS): add marketplace region for uae

* fix: rename the fields for mws integrations

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 12:57:14 +05:30
Ronel Cabrera
fcb54762a1 feat(Contacts): select billing contact for sales invoice 2020-03-12 16:58:59 +08:00
Mangesh-Khairnar
6f6e3a940b
fix: return null for attribute (#20674) 2020-02-20 12:58:54 +05:30
Mangesh-Khairnar
2d7e024f00
fix: use system language to translate strings (#20673) 2020-02-20 12:24:29 +05:30
Deepesh Garg
16445305d5 fix: Styling and minor fixes 2020-02-18 18:04:09 +05:30
racitup
3c5bb80b5a fix: Plaid transaction import order, transaction_id duplicate check, added transaction category tags 2020-02-18 17:49:35 +05:30
racitup
9a47c3dc8c fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343 2020-02-18 17:49:20 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Nabin Hait
444156184c
fix: Plaid TypeError in add_bank_accounts (#20335) 2020-01-17 15:57:48 +05:30
Himanshu
9496b8453f fix(plaid): change json structure (#20189) 2020-01-06 00:17:16 +05:30
Saurabh
d3ed499854
Merge pull request #19416 from EconCode/shopify-connector-unregisterfix 
fix: unregistering url wrong formatted string
 2019-11-11 17:04:44 +05:30
Rucha Mahabal
b455318f01 fix(Integration): Woocommerce issues (#19487) 
* fix: Delivery URL returned response code 500

* fix: set default company in Woocommerce Settings

* fix: remove redundant function calls

* fix: make offset configurable for delivery date in sales order

* fix: remove redundant code from woocommerce_settings.py

* fix: import create_custom_field

* fix: added ignore_mandatory for saving item, customer and sales order

* fix: remove unused woocommerce_check custom field

* fix: do not delete custom fields or item group when sync is disabled
 2019-11-07 18:20:32 +05:30
Chinmay D. Pai
702f9f929b
chore: rename undefined variable in shopify_log 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-10-29 13:30:13 +05:30
Chinmay D. Pai
4f7885f1aa
chore: fix unexpected keyword in shopify_settings 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-10-29 13:20:17 +05:30
EconCode
07ae3abf34 fix: unregistering url wrong formated string 
Fixed the formated string for unregistering webhooks.
String should look like:
"/admin/api/2019-04/webhooks/#{webhook_id}.json"

Taken from shopify api documentation - deleting webhooks:
https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04
 2019-10-26 16:31:29 +02:00
Saurabh
bdc899857c Fix: Shopify payload operations logging (#19366) 
* fix: payload logging for shopify

* fix: remove print statements
 2019-10-22 12:31:56 +05:30
Saurabh
039679cad1
Merge branch 'develop' into shopify 2019-09-30 19:08:44 +05:30
Chinmay Pai
9d26c69c4a fix(amazon-mws): python3 compatibility changes (#19209) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 16:59:42 +05:30
hrwx
ebc0e1ca8a fix: remove return statement 2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9 fix: sku 2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf fix: permissions 2019-09-30 14:56:39 +05:30
hrwx
5aa8743024 changes 2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
f380b215b2 fix: shopify integration 2019-09-30 14:56:39 +05:30