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

200 Commits

Author SHA1 Message Date
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-06 17:55:20 +05:30
Suraj Shetty
055b81da7b Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:10:52 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total (#24497) 2021-01-29 14:24:08 +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
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation (#24412) 2021-01-24 10:59:37 +05:30
Suraj Shetty
f0ff23eac3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test (#24434) 2021-01-21 18:43:55 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation (#24395) 
* fix: invalid taxable value of item for e-invoice

* fix: qrcode image duplicate error

* fix: net total discount calculation

* fix: auto fetch auth token
 2021-01-20 13:17:42 +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
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company (#24130) 
* fix: Fiscal year fix while creating new company

* fix: for failing Travis

* fix: suggested changes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-14 19:24:30 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues (#24358) 
* fix: overseas invoice rounding adjustment

* fix: overseas shipping address

* fix: qrcode for document name having forward slash

* feat: sandbox mode toggle

* fix: cannot delete sales invoice if linked to e invoice req log
 2021-01-13 21:00:44 +05:30
Anurag Mishra
1e396dcb2a fix: validated GST state 2021-01-13 14:01:57 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal (#24297) 2021-01-05 15:59:17 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found 2020-12-31 13:26:05 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP (#24248) 2020-12-30 19:22:37 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues (#24239) 
* fix: invoice value set to zero if rounded total disabled

* fix: unit rate & gross amount calculation

* fix: e-invoice-setup patch

* chore: no need to re-run the patch

* fix: item value & invoice value calculations
 2020-12-30 14:43:42 +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
Deepesh Garg
b074334dcf fix: Typo in tax category doctype query 2020-12-17 18:46:59 +05:30
Your Name
3ebe511eb9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-16 08:19:47 +00:00
Deepesh Garg
96a5e4effa fix: Tax template update on customer address change 2020-12-16 13:00:55 +05:30
Rushabh Mehta
34fc528500 fix(minor): debounce taxes call 2020-12-16 09:44:11 +05:30
Deepesh Garg
a767085276 fix: Tax template update on supplier 2020-12-04 18:07:46 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978) 
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-24 08:09:17 +05:30
Deepesh Garg
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue 
fix: place of supply change on address change
 2020-11-20 11:13:19 +05:30
pateljannat
1d5d863e9a fix: removing return_taxes condition 2020-11-19 20:11:45 +05:30
pateljannat
cd05b34691 fix: company filter added again 2020-11-19 11:37:08 +05:30
Smit Vora
bbe4933a52 fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ 2020-11-18 21:00:09 +05:30
pateljannat
410db04b48 fix: linter issue for translation syntax 2020-11-18 15:57:16 +05:30
pateljannat
d0c528143f Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue 2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe fix: reversing previous commits and adding condition in regional controller 2020-11-18 12:51:13 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue 2020-11-18 10:27:20 +05:30
pateljannat
6b10d87d46 fix: place of supply change on address change 2020-11-17 20:34:51 +05:30
pateljannat
642819b955 fix: place of supply change when address changes 2020-11-17 09:47:10 +05:30
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch 
fix: Auto Statewise gst tax template
 2020-11-08 17:48:57 +05:30
Deepesh Garg
59ccb64e18 fix: Auto Statewise gst tax template 2020-11-05 16:29:34 +05:30
Deepesh Garg
eacfd792e6 fix: fieldname 2020-10-30 22:12:24 +05:30
Deepesh Garg
db3fa4e6b2 fix: Place of Supply fix in Sales Invoices 2020-10-30 19:19:48 +05:30
Anurag Mishra
54cd194b41 feat: removed roles for some reginal report and added via setup 2020-09-03 13:52:40 +05:30
Deepesh Garg
cebf803455 fix: Update tax template on supplier address change 2020-09-01 16:15:28 +05:30
Deepesh Garg
afd2dd3570 fix: Unable to submit reverse charge invoice 2020-08-20 16:52:52 +05:30
Deepesh Garg
8aed48fe31 fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-19 18:59:27 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices (#23072) 2020-08-18 19:32:52 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu (#22988) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-12 19:19:03 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' (#22915) 2020-08-05 16:47:41 +05:30
Deepesh Garg
188273564c fix: Multiple fixes in GST 2020-07-17 11:31:15 +05:30
Deepesh Garg
52c319cfa7 fix: Update RCM only for indian countries 2020-07-16 00:23:58 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix 
fix: Do not add GST tax amount in grand total for reverse charge invoices
 2020-07-14 13:42:48 +05:30