Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,115 Commits 3 Branches 0 Tags 1 GiB
a9d992ac9f
Commit Graph

38 Commits

Author SHA1 Message Date
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Ankush Menat
fab7a58056 chore: remove misleading comment 2022-01-10 18:28:46 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Ankush Menat
56a25a0c4f chore: drop future from requirements.txt 2021-11-05 11:16:29 +05:30
Hussain Nagaria
0c47f3a876 feat: Add basic autocomplete using redisearch 2021-10-12 17:57:19 +05:30
ChillarAnand
8eab59b062 chore: Upgrade PyGithub to 1.55 
Frappe has upgraded to PyJWT>2. Upgrading PyGithub to resolve
dependency issues
 2021-06-09 18:05:39 +05:30
gavin
3d5e15284b
Merge pull request #25850 from gavindsouza/rm-py2 
fix: Add future in requirements.txt
 2021-06-03 11:34:24 +05:30
Gavin D'souza
07ba05630e fix: Add future in requirements.txt 
Since future is removed from frappe, adding it as a dependency here
 2021-05-28 11:44:16 +05:30
Ankush Menat
e1ab290911
chore: remove woocommerce package (#25736) 
This is not used anywhere. It was added in this commit
df83148d7c
even there it isn't being used.
 2021-05-23 11:25:35 +05:30
Ankush Menat
64a38f52cf
chore: remove frappe from requirements.txt 
Due to recent changes in pip dependency resolver, in some random cases
pip thinks frappe is not installed and tries to fetch it from pypi,
which results in errors like #25496

Until a better solution is available, frappe should not be part
of requirements.txt
 2021-04-28 16:56:10 +05:30
Rohan Bansal
524b81abd9 feat: manage Python 3 compatiblity with dependencies 2021-04-20 14:13:55 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API (#24531) 2021-02-15 11:58:27 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing (#23455) 
* feat: init e-invoice settings

* feat: read public key file

* feat: rsa encryption with public key

* feat: save token and sek from auth request

* chore: handle error response

* feat: AES decryption of SEK with appkey

* feat: decrypt json data with SEK

* feat: make e invoice from erpnext sales invoice

* feat: generate IRN

* feat: decode signed json and QR code

* chore: validations

* feat: cancel IRN

* feat: complete e-invoice schema

* chore: move e-invoice settings to regional

* chore: split einvoice settings and operations

* chore: rename schema to template & js cleanup

* feat: make IRN field on regional setup

* feat: Generate & Cancel IRN from Sales Invoice

* chore: minor fixes

* fix: item discount

* chore: show irn cancelled check after cancellation

* fix: hide cancel irn dialog on error

* fix: public key is required on validate

* fix: cannot find attached key file

* fix: validation if e invoicing is disabled

* fix: do not show generate irn for invalid supply type

* fix: update irn_cancelled after cancelling irn

* chore: show irn field for proper gst_category

* feat: e-way bill details in e-invoice

* fix: save e-way bill no on irn generation

* chore: no copy on e invoice custom fields

* feat: cancel e-way bill before cancelling IRN

* feat: manual download / upload json

* chore: group e-invoicing actions

* fix: fn name

* chore: save signed invoice and qrcode after uplaoding irn

* fix: fetch token if not valid

* chore: move einvoicing stuff to seperate folder

* feat: QRCode Image and E-Invoice Print Format

* fix: bug

* fix: invalid syntax

* chore: code cleanup

* chore: clean up e invoice actions

* fix: download & upload e-invoice

* fix: print format

* fix: validations

* fix: add permissions on regional setup

* feat: add patch

* fix: validate document name

* fix: return date

* fix: credit note einvoice

* fix: validations

* fix: error logging

* fix: e_invoice module not found

* fix: add missing package

* fix: rename e_invoice_utils.py

* fix: einvoice field validation

* fix: patch

* fix: invoice totals calculation

* fix: other charges calculation

* chore: improve document name validation message

* fix: qr code image string

* feat: initialize GSP connector

* chore: remove unwanted fields

* fix: qr code generation

* feat: fetch and cache GSTIN details

* feat: generate & cancel IRN

* feat: cancel eway bill

* chore: remove unwanted fuctions

* chore: clean up einvoice actions

* fix: attach qrcode on irn generation

* fix: generate & cancel IRN

* fix: show/hide eway bill fields

* fix: valiations

* feat: generate eway bill from IRN

* chore: remove unwanted imports

* chore: error logging

* feat: header & footer in GST E Invoice

* chore: remove test pincode

* fix: invalid syntax

* feat: cess non advolem on einvoice item

* chore: remove fetch token from e invocie settings

* fix: imports

* fix: error handling

* feat: update timeline on einvoice actions

* fix: qrcode image size

* fix: exclude intra company transactions

* fix: eway bill test

* fix: ewaybill mandatory conditions

* chore: add tests

* fix: returning condition

* feat: log e-invocing requests

* chore: add ack date and ack no field for print formats

* fix: sider issues

* feat: show e-invoice preview before IRN generation

* fix: use as_list for error message

* fix: minor ux issues

* fix: dialog is undefined

* fix: error handling

* feat: add docs link to e invoice settings

* feat: multiple gstins for e invoicing

* fix: uncomment test condition

* fix: remove test pincode

* fix: cannot cancel irn without submitting sales invoice

* chore: code cleanup

* fix: sider issues

* fix: e invoice request log permissions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-25 10:26:43 +05:30
Rushabh Mehta
6afa83f2c7 fix(requirements): update to latest pandas 2020-12-18 11:05:55 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics 2020-09-22 15:36:00 +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
marination
d4817c8685 feat: Track Youtube interactions via Video DocType 2020-08-02 05:35:45 +05:30
barredterra
23a65d8d01 fix: duplicate tweepy 2020-07-10 17:46:44 +02:00
barredterra
090bf73768 bump pandas to 1.0.5 2020-07-10 17:43:23 +02:00
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
Gavin D'souza
73089470b1 chore: pinned backwards compatible dependencies 2019-11-15 17:38:32 +05:30
Gavin D'souza
3798f8bd25 style(requirements): alphabetically sorted requirements 2019-11-15 13:59:15 +05:30
Gavin D'souza
f805a76e79 chore: pinned requirements 2019-11-13 17:27:16 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Charles-Henri Decultot
75fa6b3ee8 [Enhancement] Improvement to the sales pipeline (#15524) 
* Additions to sales pipeline

* Codacy corrections

* Codacy corrections

* Codacy corrections

* Replace _ with dummy for unused variable

* Performance + dates corrections

* Itertuples modification

* Removing trailing whitespaces

* Sales stage doctype

* Divide sales stages fixtures in separate functions

* Remove duplicate fixtures

* Add newline after method

* Missing requirement
 2018-10-03 10:41:40 +05:30
Vinayak Jethe
df83148d7c Woocommerce Integration (#13217) 
* WIP for WooCommerce Integration

* WIP for WooComm Integration

* WIP WooComm

* Added Woocommerce Settings

* Woocommerce Settings

Enable Sync Makes fields mandatory

* Woocommerce whitelisted endpoints

* [Clean Up] Woocommerce Settings

* Verify Webhook Data

* Fix Verify Webhook

* WIP WooComm

* WIP and working few modules

* Customer creating partially

* Customer creation successful

* Refactored Customer code

* WIP Address

* Fixed address and customer bug. Now working fine

* WIP for products. Creation of items successful

* Handling json for product

* Products creating and updating properly

* Custom checkbox for required doctypes

* Product feature fully completed

* WIP orders

* Sales order working properly

* Orders mapping successfully

* New version Customer Working Properly

* Items creation properly

* Working on sales order

* Orders comming successfully

* Bug fixes

* Fixed date format for delivery date

* Code Cleanup

* Woo setting page modified

* Fixed minor bug

* Fixes

* Minimum Viable Product

* Cleanup

* Removed duplicate file from erpnext config

* Added more default changes to woo settings

* Fixes as per required

* Fixes

* Bug fix

* few changes and fix

* Fixing

* Fixes with test

* Added Test for Woocommerce - Emulates request

* Fix woocommerce test

* fix woocommerce test

* verify_request: py3 ready

* Codacy fixes

* WooCommerce Integration Docs

* Codacy changes

* Codacy fixes

* User set tax account

* Fixes for account

* Fix for warehouse issue

* Docs updated

* Codacy fix

* Updated Docs

* Minor changes

* Tested added for repeat order and cleanup

* Minor change

* docs and gifs renamed according to convention

* Doc updated
 2018-04-03 11:17:03 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008) 
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
 2018-03-01 10:59:21 +05:30
Achilles Rasquinha
9b74f8bd37
Update requirements.txt 2018-02-16 17:49:55 +05:30
Giovanni
a04c756913 - validate EAN or UPC-A code 
- made Item Barcode Doctpye standard
- added stdnum to requirements
 2017-12-10 18:54:08 +01:00
creamdory
fd1503c6a5 [New Feature] Delivery 2017-11-20 10:28:49 +08:00
Saurabh
7d05a3470c [fix] added pygithub dependancy (#11559) 2017-11-14 13:41:01 +05:30
Pratik Vyas
3f4c3086df Remove frappe version pinning in requirements.txt 2014-09-03 10:35:13 +05:30
Anand Doshi
2adf73cca1 Fixed requirements.txt 2014-06-30 12:18:08 +05:30
Pratik Vyas
4f1371945d hotfix: frappe version in requirements.txt 2014-05-20 16:39:29 +05:30
Pratik Vyas
4d911db902 Release 4.0.0 2014-05-05 19:14:45 +05:30
Nabin Hait
c07537b1e9 unidecode added to the erpnext requirements 2014-03-21 12:25:49 +05:30
Nabin Hait
19dadb4a82 unidecode added to the erpnext requirements 2014-03-21 11:46:51 +05:30