Commit Graph

55 Commits

Author SHA1 Message Date
Deepesh Garg
88176e65e4 fix: Check for gst_hsn_code 2021-06-10 17:31:28 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +05:30
Deepesh Garg
c6dcc9d94a fix(India): Taxable value for invoices with additional discount 2021-06-01 13:13:04 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase ()
* 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
Saqib
e930456be2
fix(e-invoicing): 'NoneType' object is not iterable () 2021-05-21 16:31:12 +05:30
Saqib Ansari
b9ad385232 fix: remove uncessary query 2021-05-19 19:13:06 +05:30
Saqib Ansari
7fb385a89f fix: cannot bypass e-invoicing for non gst item invoices 2021-05-19 18:47:06 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field () 2021-05-06 16:10:55 +05:30
Saqib
b643776c53
feat(e-invoicing): auto calculate distance for e-way bill generations () 2021-04-26 17:12:20 +05:30
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing ()
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-17 15:38:47 +05:30
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes ()
* fix: GST on freight charge in e-invoicing

* feat(india): bulk e-invoice generation ()

* fix: cannot fetch e invoice settings

* fix: patch condition ()

* fix: patch condition

* fix: except einvoice loading error seperately

* fix: json.loads error

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-04-13 18:49:03 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch () 2021-04-13 15:46:01 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation () 2021-04-12 17:55:46 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing ()
* fix: GST on freight charge in e-invocing

* fix: Add patch for taxable value field

* fix: Handle discounts on net total

* fix: Handle all types of discounts for e-invoicing

* fix: Absolute taxable values

* fix: Use correct tax amount
2021-04-12 10:55:43 +05:30
Saqib Ansari
30720d2139 fix: set correct ack no. on irn generation 2021-04-08 19:06:44 +05:30
Kaviya Periyasamy
2cef23d4c9
fix: object referencing the same address issue ()
* fix: variable reference to same address

* fix: object referencing same address issue

* fix: value error
2021-04-03 11:30:49 +05:30
bhavesh95863
7535341016
fix(regional): remove shipping address GSTIN validation for e-invoice () 2021-04-02 15:04:48 +05:30
Saqib
5447b250fe
fix: place of supply of e-invoicing () 2021-04-02 12:16:19 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
Saqib
fa777555b7
fix(india): inflated item tax rate for e-invoicing () 2021-02-28 20:46:23 +05:30
Ankush Menat
d5656f4b76
fix(india): Escape json characters in text fields ()
Escape all text fields and add helpful error message if JSON decode
error does happen.
2021-02-23 17:26:37 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ()
* fix(india): escape for special characters in JSON ()

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation ()

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle ()

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Ankush Menat
98a0feab89
fix(india): escape for special characters in JSON ()
JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811
2021-02-22 19:30:02 +05:30
Afshan
33f4419a78 fix: StopIteration error when e-invoice not enabled ()
* fix: StopIteration error when e-invoice not enabled

* chore: update message

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 21:23:38 +05:30
Saqib
e965d0ff90 fix: discount amount calculation on net total () 2021-02-18 20:59:46 +05:30
Saqib
fd4bed1a38 fix(e-invoice): do not validate gstin for exports () 2021-02-18 20:59:26 +05:30
Saqib
ade96589b4 fix(e-invoice): skip e-invoice generation for non-taxable invoices () 2021-02-18 20:58:54 +05:30
Saqib
18c7c45cfe fix: NoneType has no len() () 2021-02-18 20:55:53 +05:30
Saqib
57c2e07c45 fix: validate cancellation only if irn generated () 2021-02-18 20:45:27 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() () 2021-02-12 12:24:41 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated () 2021-02-11 17:50:57 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() () 2021-02-10 17:21:12 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled ()
* fix: StopIteration error when e-invoice not enabled

* chore: update message

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-08 12:32:42 +05:30
Saqib
9490122abb
fix(e-invoice): skip e-invoice generation for non-taxable invoices () 2021-02-08 11:40:56 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports () 2021-02-06 17:55:20 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total () 2021-01-29 14:24:08 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation () 2021-01-24 10:59:37 +05:30
Saqib
577d2bed6e
fix: failing einvoice test () 2021-01-21 18:43:55 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ()
* 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
Saqib
53cb9f9f47
fix(e-invoicing): ux issues ()
* 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
Saqib
80e0952ba7
refactor: fetch & validate address from erpnext rather than gst portal 2021-01-05 16:04:25 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal () 2021-01-05 15:59:17 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes () 2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes () 2021-01-05 13:53:51 +05:30
Saqib
f8f015c961
fix: cannot submit e-invoice if legal name not found 2020-12-31 13:28:08 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found 2020-12-31 13:26:05 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation () 2020-12-31 11:35:46 +05:30