Commit Graph

34090 Commits

Author SHA1 Message Date
Deepesh Garg
8bc69d3fe0 Revert "fix: Minor Issues"
This reverts commit 1907c8f30b.
2021-01-15 10:05:21 +05:30
Deepesh Garg
cd3d6ade04 fix: Add shipping_address to no field map 2021-01-14 14:35:54 +05:30
Deepesh Garg
9070ec3237 fix: GST Purchasse register and other fixes 2021-01-14 14:07:10 +05:30
Deepesh Garg
cfcb1a15f8 fix: remove self 2021-01-13 19:33:07 +05:30
Deepesh Garg
d0ee3fc0cd fix: Target field in Sales Invoice 2021-01-13 19:23:36 +05:30
Deepesh Garg
776d89c4de fix: From warehouse in Purchase Order 2021-01-13 19:04:53 +05:30
Deepesh Garg
a02cad5ec4 fix: Item wise gst sales register fix 2021-01-13 16:44:37 +05:30
Deepesh Garg
837aae7bcb fix: Unreallized profit in Sales Register 2021-01-13 16:43:31 +05:30
Deepesh Garg
cfcc9eac39 fix: Rate forcing in sales order 2021-01-11 18:20:23 +05:30
Deepesh Garg
4b86f0440e fix: Remove commented code 2021-01-11 18:20:15 +05:30
Deepesh Garg
f709d57475 fix: Check for custom dimensions 2021-01-05 15:55:19 +05:30
Deepesh Garg
377fe373e2 fix: Minor Issues 2020-12-31 11:05:11 +05:30
Deepesh Garg
39ba31e68f fix: Set batch values 2020-12-28 23:35:03 +05:30
Deepesh Garg
6d3e843f07 fix: Price not getting set for first row 2020-12-28 23:22:09 +05:30
Deepesh Garg
a679d43722 fix: Item Price using batch selector 2020-12-28 21:14:13 +05:30
Deepesh Garg
2466c3214a fix: Add missing semicolon 2020-12-28 21:13:54 +05:30
Deepesh Garg
646ead65d8 fix: Sider issues 2020-12-28 21:13:43 +05:30
Deepesh Garg
7b282d253f fix: Move item price link to batch 2020-12-28 21:13:36 +05:30
Deepesh Garg
37320074b2 fix: Sider Issues 2020-12-28 21:13:27 +05:30
Deepesh Garg
a5353c7d2d fix: Add test case for batch pricing 2020-12-28 21:13:17 +05:30
Deepesh Garg
e85050c190 fix: Rate for items with no batch 2020-12-28 21:13:09 +05:30
Deepesh Garg
c3b22c6e5c feat: Batch wise item pricing 2020-12-28 21:12:58 +05:30
Deepesh Garg
73cef56df7 fix: Debug travis 2020-12-28 17:44:00 +05:30
Deepesh Garg
a0f6381d6e fix: Debugging 2020-12-28 17:43:21 +05:30
Deepesh Garg
b7b3944cef fix: Internal sales item link in Purchase Invoice 2020-12-28 17:43:11 +05:30
Deepesh Garg
9d4bf040e9 fix: Fixes in flow 2020-12-28 17:11:10 +05:30
Deepesh Garg
afef92a88b fix: Add validations and other fixes 2020-12-28 17:10:53 +05:30
Deepesh Garg
a9f4508cd1 fix: Add missing set warehouse fields 2020-12-28 17:06:14 +05:30
Deepesh Garg
dac19cbca5 fix: Consider conversion factor for invoices 2020-12-28 17:05:25 +05:30
Deepesh Garg
573d9094bb fix: Item valuation for internal stocktransfers 2020-12-28 17:05:16 +05:30
Deepesh Garg
0413e34f0d Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into enconnex_erpnext 2020-12-28 17:04:35 +05:30
Saurabh
0a4ac4583e Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.7 2020-12-26 14:55:52 +05:30
Saurabh
d1d030b54a bumped to version 13.0.0-beta.7 2020-12-26 15:15:51 +05:50
Nabin Hait
af1af925ac chore: Added change log (#24213) 2020-12-26 11:09:46 +05:30
Saqib
17e96901db 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 20:55:21 +05:30
Nabin Hait
f8c1cb5dc3 fix: Removed permissions from UAE VAT Settings 2020-12-25 20:53:18 +05:30
rohitwaghchaure
49d7499990 fix: added shipment link in delivery note dashboard (#24210)
* fix: added shipment link in delivery note dashboard

* Update shipment.py
2020-12-25 18:15:35 +05:30
rohitwaghchaure
0917c1ec7c fix: travis failing (#24211) 2020-12-25 18:13:12 +05:30
Nabin Hait
327f03566a Reposting fixes pre release (#24203)
* fix: finished item validation and rate

* fix: Check if stock and account balance in sync after reposting

* fix: validate stock accounts in journal entry

* fix: validate expense against budget
2020-12-25 18:11:54 +05:30
rohitwaghchaure
fc01a838b5 Merge pull request #24208 from rohitwaghchaure/fixed-serial-no-return-issue-v13
fix: partial serial no return issue
2020-12-25 13:32:36 +05:30
Rohit Waghchaure
adc369f726 fix: partial serial no return issue 2020-12-25 13:28:47 +05:30
rohitwaghchaure
a4d71d5c7f Merge pull request #24205 from rohitwaghchaure/pricing-rule-not-working-margin-v13-beta
fix: multiple pricing rule with margin type as Percentage is not working
2020-12-25 09:33:22 +05:30
Rohit Waghchaure
ba5b603a0b fix: multiple pricing rule with margin type not working 2020-12-24 22:49:38 +05:30
Rucha Mahabal
9fe7f235d0 fix: Do not cancel reference document on Quality Inspection cancellation (#24198) 2020-12-24 11:03:48 +05:30
Afshan
7b385046b6 Merge pull request #24192 from AfshanKhan/sal-slip-pop-up-error
fix: sal slip popup error
2020-12-23 14:34:37 +05:30
Afshan
adf9b49e14 fix: sal slip popup error 2020-12-23 11:39:38 +05:30
Deepesh Garg
7d2c5c24c6 Merge branch 'enconnex_erpnext' of https://github.com/frappe/erpnext into enconnex_erpnext 2020-12-23 10:39:56 +05:30
Deepesh Garg
107e2cdaba fix: Tax template update on supplier 2020-12-23 10:37:55 +05:30
Deepesh Garg
a2bf727794 fix: Tax template update on customer address change 2020-12-23 10:37:08 +05:30
Anurag Mishra
0a1390a7ca fix: leave policy dashboard fix and roles (#24170) 2020-12-22 11:16:36 +05:30