Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,441 Commits 3 Branches 0 Tags 1 GiB
828769ca70
Commit Graph

1000 Commits

Author SHA1 Message Date
Saqib
f66aab6d98
fix: e-invoicing option visible even if settings disabled (#25021) 2021-03-26 16:40:51 +05:30
Ishan Loya
de774ae080
Correct state code for 'Other Territory' 
Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992
 2021-03-24 12:30:51 +05:30
Deepesh Garg
ea487b6c2e
Revert "fix: GSTR B2C report" 2021-03-22 20:54:07 +05:30
Deepesh Garg
adcf9a42bd
Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:51 +05:30
Deepesh Garg
a5de22cb8e
Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:41 +05:30
Rucha Mahabal
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926) 2021-03-17 19:51:59 +05:30
Rucha Mahabal
cbd67e662f
fix: calculate 80g certificate amount on validate for memberships (#24925) 2021-03-17 19:49:27 +05:30
Deepesh Garg
438d9cad90 fix: Remove print statement 2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13 fix: Group nil exempted and non gst items separately 2021-03-17 18:03:58 +05:30
Deepesh Garg
f9f0e347ed fix: Remove print statement 2021-03-17 18:03:17 +05:30
Deepesh Garg
084ec9773e fix: Group nil exempted and non gst items separately 2021-03-17 18:00:08 +05:30
Deepesh Garg
a5987782bd fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:49:44 +05:30
Deepesh Garg
56c20fb79f fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:47:03 +05:30
Rucha Mahabal
00cce433a5
fix(Non Profit): Membership and Donation API fixes (#24900) (#24905) 
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
 2021-03-16 20:52:53 +05:30
Rucha Mahabal
1482b2883f
fix(Non Profit): Membership and Donation API fixes (#24900) 
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
 2021-03-16 20:08:51 +05:30
Deepesh Garg
d4a3cf1395 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13 2021-03-16 13:24:33 +05:30
Deepesh Garg
635c480771 fix: Add method for regional round off account back 2021-03-16 13:22:20 +05:30
Deepesh Garg
004f9e6b0c fix: Add method for regional round off account back 2021-03-16 13:09:59 +05:30
Deepesh Garg
7f2e45e0f4
fix: Unequal debit and credit issue on RCM Invoice (#24838) 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis
 2021-03-15 18:04:47 +05:30
Deepesh Garg
93f925fb98
fix: Unequal debit and credit issue on RCM Invoice (#24836) 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-15 18:04:42 +05:30
Raffael Meyer
fb68aba30d
Merge branch 'develop' into improve_taxes_setup 2021-03-11 13:17:44 +01:00
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
Nabin Hait
6e3668dc30 fix: merge conflict 2021-03-11 16:14:27 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations (#24848) 
* feat(Non Profit): 80G Certificates and Donations

* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)
 2021-03-11 16:02:23 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations (#24657) 
* feat: 80G Certificates

* feat: add non-profit custom fields for India

* feat: 80G Certificate print format for memberships

* feat: Donation doctype and API endpoint to capture donations via razorpay

* chore: Rename Membership Settings to Non Profit Settings

* chore: clean up Non Profit Settings

- Rename fields, better labels

- patch for renaming

* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings

* feat: Payment Entry for donations

- added Donor as Party Type

- setting for automating payment entries for donations created via web form

* fix: linter and sider issues

* fix: translation syntax

* feat: PAN Details custom field for Indian donors

* feat: 80G certificates for Donations with Print Format

* fix: sider

* feat: validations for donor and donation

- create donor for website user from donations

- validate donor email

* feat: extract member name from subscription notes

* test: Donation

* test: Tax Exemption 80G Certificate

* chore: styling fixes

* fix: tests

* fix: sider

* feat: extract PAN number from additional subscription notes

* feat: Add creation user field in Non Profit Settings

fix: Payment Entry not generating for memberships and donations

* feat: update desk page

* fix: tests
 2021-03-11 13:19:44 +05:30
Raffael Meyer
fbd810c2ae
Merge branch 'develop' into improve_taxes_setup 2021-03-10 11:38:52 +01:00
Marica
baa406e99f
Merge pull request #24794 from alyf-de/set_value_instead_of_sql 
fix: use set_value instead of sql
 2021-03-09 11:54:31 +05:30
barredterra
99c8b8efcf Merge branch 'develop' into improve_taxes_setup 2021-03-08 20:00:59 +01:00
Deepesh Garg
48b0f0da96
Merge pull request #24776 from ankush/gst_invoice_validation 
fix: Add warning for invalid GST invoice numbers
 2021-03-07 18:09:00 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition (#24800) 2021-03-06 19:00:08 +05:30
barredterra
dcfc3d7d12 fix: remove redundant calls to create_sales_tax 2021-03-04 19:29:55 +01:00
barredterra
1521b31795 fix: use set_value instead of sql 2021-03-03 12:33:48 +01:00
Ankush Menat
7c4c42ad67
refactor: move regex patterns to global variables 2021-03-03 14:56:19 +05:30
Ankush Menat
9b3f5d5f67
test: add tests for gst invoice name checks 2021-03-03 13:36:59 +05:30
Ankush Menat
a44df63a91
fix: Add warning for invalid GST invoice numbers 
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
 2021-03-03 11:26:12 +05:30
Saqib
fa777555b7
fix(india): inflated item tax rate for e-invoicing (#24752) 2021-02-28 20:46:23 +05:30
Ankush Menat
d5656f4b76
fix(india): Escape json characters in text fields (#24699) 
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 (#24702) 
* fix(india): escape for special characters in JSON (#24695)

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 (#24679)

* 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 (#24694)

* 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
Nabin Hait
866cf70d3a fix: validate pan 2021-02-22 21:35:00 +05:30
Ankush Menat
98a0feab89
fix(india): escape for special characters in JSON (#24695) 
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
Deepesh Garg
bb8cd1cdaa
feat: Basic validation for indian PAN No. in Supplier (#24687) 2021-02-22 19:28:45 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation (#24679) 
* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition
 2021-02-22 19:27:23 +05:30
Deepesh Garg
6f29f67a83
Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue 
fix: excluding unidentified accounts from gstr-1
 2021-02-20 17:27:56 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
Ankush Menat
3248da9089 fix(India): Add GST state code for Ladakh 2021-02-18 21:32:48 +05:30
Afshan
33f4419a78 fix: StopIteration error when e-invoice not enabled (#24548) 
* 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 (#24497) 2021-02-18 20:59:46 +05:30
Saqib
fd4bed1a38 fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-18 20:59:26 +05:30
Saqib
ade96589b4 fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568) 2021-02-18 20:58:54 +05:30
Saqib
18c7c45cfe fix: NoneType has no len() (#24600) 2021-02-18 20:55:53 +05:30
Saqib
57c2e07c45 fix: validate cancellation only if irn generated (#24608) 2021-02-18 20:45:27 +05:30
pateljannat
4858b40813 fix: excluding unidentified accounts from gstr-1 2021-02-18 18:44:29 +05:30
Deepesh Garg
79f63526cb
Merge pull request #24632 from ankush/ladakh_gst_addition 
fix(India): Add GST state code for Ladakh
 2021-02-15 21:11:54 +05:30
Deepesh Garg
b6cd97e5fc
Merge pull request #24320 from pateljannat/ldc-validations 
fix: validation for ldc against supplier and section code
 2021-02-15 16:33:41 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh 2021-02-15 15:03:50 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() (#24616) 2021-02-12 12:24:41 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated (#24608) 2021-02-11 17:50:57 +05:30
Anuja Pawar
e3c72a3d71
fix: fix filters for the report (#24594) 2021-02-11 11:06:12 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() (#24600) 2021-02-10 17:21:12 +05:30
pateljannat
1ab95413be fix: conditions simplified 2021-02-09 17:35:17 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled (#24548) 
* 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 (#24568) 2021-02-08 11:40:56 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-06 17:55:20 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
 2021-02-02 22:03:07 +05:30
Nabin Hait
243d59b0c3
Reposting logic fixes (#24520) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes

* fix: test fix
 2021-02-02 16:55:13 +05:30
Saqib Ansari
cee3670167 chore: clean up sales invoice form 2021-02-01 15:45:26 +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
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions (#24227) 
* fix: make custom fields in pos invoice similar to sales invoice

* feat: allow/disallow rate & discount change

* fix: any pos profile can be selected while creating pos opening

* fix: cannot add item to cart

* fix: validate phone payment only if payment request exists

* fix: replace pos payment method patch

* chore: rearrange item & customer group filter

* fix: allow/disallow invoice level discount

* fix: updating qty of item with uom having space char

* fix: move configuration checbox to config section

* fix: invalid item rate trigger

* fix: cannot remove item from draft invoices

* fix: customer currency not set in pos invoice

* fix: duplicate item error message

* fix: sales uom not fetched in pos invoice

* fix: cannot add taxes to pos invoice for uae region

* fix: cannot merge pos invoice into credit note

* fix: tax calculation while merging pos invoices

* feat: delete draft orders from order list

* fix: merging of pos invoice with pricing rules
 2021-01-28 17:58:55 +05:30
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +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
Jannat Patel
3914aca647
fix: check for tax rate (#24376) 2021-01-28 12:25:15 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation (#24441) 
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
 2021-01-28 12:16:26 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account (#24086) 
* feat: add temporaray against account nmber to datev settings

* feat: use temporary against account in datev report

* test: add temp against account number to test data

* test: include temp against aaccount in filters
 2021-01-25 21:22:10 +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 (#24412) 2021-01-24 10:59:37 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year 
fix: use supplied year for IRS 1099 forms
 2021-01-22 12:17:43 +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
pateljannat
f110759897 fix: date validation 2021-01-20 18:12:48 +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
Rohan Bansal
97b9995f8f fix: use supplied year for IRS 1099 forms 2021-01-19 19:10:03 +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
pateljannat
3c55463b4b fix: validation for ldc against supplier and section code 2021-01-07 12:41:44 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany 
fix: regional validation of sales invoice (germany)
 2021-01-06 09:35:05 +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 (#24297) 2021-01-05 15:59:17 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity 2021-01-05 14:47:38 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes (#24282) 2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 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 (#24253) 2020-12-31 11:35:46 +05:30
Karthikeyan S
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP (#24251) 2020-12-30 19:41:00 +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
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany 2020-12-29 11:58:57 +01:00
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity 2020-12-29 13:27:03 +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
0788df412c fix: Removed permissions from UAE VAT Settings 2020-12-25 20:54:01 +05:30
Nabin Hait
f8c1cb5dc3 fix: Removed permissions from UAE VAT Settings 2020-12-25 20:53:18 +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
Anurag Mishra
af9f172be8 fix: requested changes and sider 2020-12-23 18:07:53 +05:30
Anurag Mishra
46e1c09b45 style: Broken into smaller function 2020-12-23 18:07:53 +05:30
Anurag Mishra
493eea19e8 feat: added link from desk page and some minor fixes 2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d test: gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
e1464a7bf0 feat: Indian Standard Gratuity Rule 2020-12-23 18:07:06 +05:30
Anurag Mishra
34a7250a2d fix: Some enhancements and better validation 2020-12-23 18:07:06 +05:30
Anurag Mishra
0761301c2e feat: Added all 3 standard slab for UAE 2020-12-23 18:07:06 +05:30
barredterra
df8ea19406 fix: whitespace 2020-12-22 17:34:31 +01:00
barredterra
2acd8cbc02 fix: sider 2020-12-22 17:34:22 +01:00
barredterra
511be6466d Revert "fix: fail silently" 
This reverts commit 6900a79421.
 2020-12-22 11:43:33 +01:00
barredterra
a69021018a test: add test for accounts controller 2020-12-22 11:38:09 +01:00
barredterra
5adbe49ca6 refactor: translation syntax 2020-12-22 11:37:43 +01:00
barredterra
6900a79421 fix: fail silently 2020-12-22 11:37:13 +01:00
Deepesh Garg
e77e3aa36d fix: Typo in tax category doctype query 2020-12-17 18:49:58 +05:30
Deepesh Garg
b074334dcf fix: Typo in tax category doctype query 2020-12-17 18:46:59 +05:30
Deepesh Garg
a9db5a200f
Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13 
fix: Tax template update on customer address change
 2020-12-16 21:51:01 +05:30
Deepesh Garg
ad59726f20 fix: Tax template update on customer address change 2020-12-16 20:51: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
Nabin Hait
13dc63499a Merge branch 'develop' into version-13-beta-pre-release 2020-12-15 09:06:27 +05:30
Deepesh Garg
05e8479521
Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices 
fix: Opening invoices in GSTR-1 report
 2020-12-14 11:14:23 +05:30
Deepesh Garg
c838682188 fix: Opening invoices in GSTR-1 report 2020-12-14 10:35:16 +05:30
Nabin Hait
3423d94145 fix: Fixed merge conflict 2020-12-12 21:12:56 +05:30
Deepesh Garg
cfeca0dc87 fix: Show tax amount in base currencies 2020-12-06 18:28:30 +05:30
Deepesh Garg
a767085276 fix: Tax template update on supplier 2020-12-04 18:07:46 +05:30
Rohit Waghchaure
1ac040a418 fix: GSTR report 2020-12-01 13:50:01 +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
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format 
feat: UAE VAT 201 Report
 2020-11-18 15:15:00 +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
Mohammad Hasnain
d2477e6cc5 fix(UAE VAT 201): remove branch parts 2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d feat(UAE VAT 201): emirate according to branch 2020-11-16 17:36:27 +05:30
Mohammad Hasnain
b8d0b546a7 feat(UAE VAT Format): use company address for emir 2020-11-16 12:58:38 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report (#23892) 
* feat(DATEV Settings): button to show report

* feat(desk): add DATEV to Reports under Accounting

* fix(report DATEV): last calendar month as default

* fix: let user create DATEV Settings

(Instead of showing an error message.)
 2020-11-15 09:45:10 +05:30
Raffael Meyer
8ff0d0cff6
feat: make account number length configurable (#23845) 2020-11-15 09:34:05 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format 2020-11-10 09:58:45 +05:30
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax 2020-11-09 19:04:46 +01:00
Raffael Meyer
4f880e7454
refactor: zip_and_download (#23844) 2020-11-09 20:17:56 +05:30
rohitwaghchaure
94bfa6a659
Merge pull request #23843 from frappe/datev_check_fiscal_year 
feat: validate fiscal year
 2020-11-09 12:33:15 +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
Mohammad Hasnain
4d99d695a3 feat(uae vat 201): update desk page entry 2020-11-06 23:33:19 +05:30
Saurabh
7c06c28216 fix: merge-conflicts 2020-11-06 19:08:58 +05:30
barredterra
f91d82b538 fix: imports 2020-11-05 17:28:39 +01:00
barredterra
815341d454 feat: validate fiscal year 2020-11-05 16:57:23 +01:00
Deepesh Garg
59ccb64e18 fix: Auto Statewise gst tax template 2020-11-05 16:29:34 +05:30
Mohammad Hasnain
bed4e85aec fix(uae vat 201): date filters were not working 2020-11-04 10:44:22 +05:30
Mohammad Hasnain
510d0d3f20 Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format 2020-11-04 10:32:22 +05:30
Mohammad Hasnain
f2c895ddb5 feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise 2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan
6a0b28bde3
Merge branch 'develop' into UAE-VAT-Format 2020-11-02 23:59:13 +05:30
Mohammad Hasnain
7a034595fe fix(UAE VAT 201): Remove Chart 2020-11-02 13:12:27 +05:30
Mohammad Hasnain
b0eca23485 Refactor(UAE VAT 201): Fix fomatiing 2020-11-02 12:47:10 +05:30
Mohammad Hasnain
c53237f5e0 refactor(UAE VAT 201): solve syntax errors 2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin Rajan
d322181fd7
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin Rajan
7b771d139c
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin Rajan
46265d3fc7
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin Rajan
be7a4c8b0a
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin Rajan
f116fbf84d
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-02 10:27:54 +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
Mohammad Hasnain
eb3084b072 refactor(UAE VAT 201): break functions 2020-10-29 09:52:17 +05:30
Mohammad Hasnain
bf261a6c39 fix(UAE VAT 201): fix helper 2020-10-29 00:07:52 +05:30
Mohammad Hasnain
08846f6b11 refactor(UAE VAT 201): replace cartesian product to inner joins 2020-10-28 23:33:56 +05:30
Mohammad Hasnain
2c00549dfe refactor(UAE VAT 201): Use frappe api instead sql 2020-10-28 22:54:56 +05:30
Mohammad Hasnain
81f2efd9b0 chore(UAE VAT 201): Rename emirate to vat emirate 2020-10-28 10:28:25 +05:30
Mohammad Hasnain
5953acab8b chore(UAE VAT 201): cleanup 2020-10-25 15:43:21 +05:30
Mohammad Hasnain
0ceae0bd66 feat(UAE VAT 201): emirate customizable 2020-10-25 13:06:42 +05:30
Mohammad Hasnain
0ac40c75aa chore(UAE VAT): update tesr dependencies 2020-10-25 01:16:06 +05:30
Mohammad Hasnain
8796567b42 chore(UAE VAT 201): add puctuation 2020-10-20 16:35:28 +05:30
Mohammad Hasnain
33e9a1ab31 refactor(UAE VAT 201): solve linting issues 2020-10-20 13:04:38 +05:30
Mohammad Hasnain
6a24da4efd refactor(UAE VAT 201): break functions 2020-10-20 11:53:06 +05:30
Mohammad Hasnain
c08591124c chore(UAE VAT 21): solve merge conflicts 2020-10-20 10:17:48 +05:30
Mohammad Hasnain
234036df32 chore(uae vat 201): solve travis issues 2020-10-20 07:42:10 +05:30
Mohammad Hasnain
853fd03f49 feat(uae vat 201): fix linter issues 2020-10-19 22:35:16 +05:30
Mohammad Hasnain
33cdfdfb7f feat(UAE VAT 201): Add tests for report 2020-10-19 20:48:43 +05:30
Mohammad Hasnain
c1b8004757 feat(UAE VAT 21): claimable to recoverable 2020-10-19 20:47:56 +05:30
Mohammad Hasnain
32eb9a7893 feat(UAE VAT 201): claimable to recoverable 2020-10-19 17:58:50 +05:30
Mohammad Hasnain
b9dc13294d chore(UAE VAT 201) solve translations issues 2020-10-14 16:56:26 +05:30
Mohammad Hasnain
dfc3993cec chore(UAE VAT 21): rename report 2020-10-14 12:21:36 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
barredterra
9aa3e7a37d feat: address template for luxembourg 2020-10-13 13:35:33 +02:00
Mohammad Hasnain
ac451b3a54 feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice 2020-10-11 01:40:22 +05:30
hasnain2808
f8db9582c3 feat(UAE VAT 21): Add currency formatting 2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388 feat(UAE VAT 21): add fixed width to columns 2020-10-01 12:44:39 +05:30
hasnain2808
10a3a338b6 refactor: change uae vat settingplural 2020-09-30 21:51:00 +05:30
hasnain2808
3294f86b92 refactor: fix linting 2020-09-30 12:15:07 +05:30
barredterra
81ad90c1d4 feat: validate sales invoice for germany 2020-09-29 11:54:57 +02:00
hasnain2808
23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
hasnain2808
2c62d946f5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-09-28 20:03:27 +05:30
hasnain2808
80068e16e8 Refactor(UAE VAT 21): Replace f-strings by format 2020-09-28 18:58:27 +05:30
hasnain2808
0860c74c82 feat(UAE VAT 21): Add permissions for doctypes 2020-09-28 14:38:45 +05:30
hasnain2808
2d30148940 feat(UAE VAT 21): Add vat settings 2020-09-28 14:38:14 +05:30
hasnain2808
2a601e59bf fix(UAE VAT 21): remove extra legend 2020-09-28 13:26:43 +05:30
hasnain2808
bed1add349 docs(UAE VAT 21): add docstrings 2020-09-28 13:26:05 +05:30
hasnain2808
815b7584dd refactor(UAE VAT 21): seperate get_chart, get_data 2020-09-28 13:24:40 +05:30
hasnain2808
79aca28453 refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21 2020-09-28 12:27:41 +05:30
hasnain2808
127fbfcb93 feat(UAE VAT 21): Added Print Format 2020-09-25 20:42:54 +05:30
hasnain2808
321b5f54ae feat(UAE VAT 21): Add Roles for UAE VAT 21 Report 2020-09-25 14:24:57 +05:30
hasnain2808
72cad2a8ab feat(UAE VAT 21): Add zero rated and vat exempt 2020-09-25 13:13:38 +05:30
hasnain2808
5225215d31 feat(UAE VAT 21): Add rows for inputs and tourists 2020-09-24 18:41:43 +05:30
hasnain2808
3ef11b1d64 feat(UAE VAT 21): Add region fields for UAE VAT 21 2020-09-24 13:21:23 +05:30
barredterra
16f1435d63 fix: codacy 2020-09-11 18:57:58 +02:00
barredterra
41978ac882 Merge branch 'develop' into datev_refactor 2020-09-11 17:54:50 +02:00
hasnain2808
f44524dd3e feat: Added a Chart to compare Vat and sales between emirates 2020-09-10 18:35:04 +05:30
hasnain2808
323791d123 refactor: added docstrings 2020-09-10 17:53:29 +05:30
hasnain2808
031d77be2e feat: add reverse charge to uae vat report 2020-09-10 17:40:01 +05:30
hasnain2808
91f1e26672 feat: Add rated supplies rows in UAE VAT report 2020-09-10 13:55:14 +05:30
hasnain2808
7b7a8e1309 feat: RCM for UAE VAT 2020-09-09 20:54:30 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs 2020-09-08 12:03:45 +05:30
hasnain2808
2744765757 feat(UAE VAT Format): add fields for emirates in address and sales invoice 2020-09-07 12:31:19 +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
Afshan
d659774190 fix:tests 2020-08-28 13:40:48 +05:30
Afshan
7586c3408e fix: test case 2020-08-28 12:56:37 +05:30
Afshan
b719620d0c fix: handleling condition if default company doesn't exist 2020-08-26 20:55:16 +05:30
Afshan
7600960d2b fix: returned empty list if non US based company 2020-08-26 18:40:11 +05:30
Deepesh Garg
f4b939754c fix: Codacy fixes 2020-08-26 12:10:12 +05:30
Deepesh Garg
29f187f4f3
Merge branch 'develop' into hsn_wise_json 2020-08-26 12:05:59 +05:30
Deepesh Garg
c3fb68265f fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-25 13:35:33 +05:30
Deepesh Garg
afd2dd3570 fix: Unable to submit reverse charge invoice 2020-08-20 16:52:52 +05:30
Raffael Meyer
f0b9f660cd
Merge branch 'develop' into datev_refactor 2020-08-20 12:05:50 +02:00
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
aaeb3980bc feat: JSON download for HSN wise outward summary 2020-08-19 15:13:30 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 
fix: Tax amounts in HSN Wise Outward summary
 2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401 fix: Remove print statements 2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907 fix: Tax amounts in HSN Wise Outward summary 2020-08-19 11:41:33 +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
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay 
fix: GSTR 1 report for exports without payment of Tax
 2020-08-10 09:56:12 +05:30
Deepesh Garg
d4ecf426b7 fix: Place of supply fix 2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0 fix: Taxable value for RCM 2020-08-08 22:28:13 +05:30
Deepesh Garg
ab611d5fd8 fix: GSTR 1 report for exports without payment of Tax 2020-08-07 14:47:40 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' (#22915) 2020-08-05 16:47:41 +05:30
barredterra
517df5fb0e fix: codacy (again) 2020-07-29 18:16:49 +02:00
barredterra
b719378ee5 fix: codacy 2020-07-29 18:11:04 +02:00
barredterra
dec2c90866 refactor: move datev-specific stuff to utils 2020-07-29 17:14:23 +02:00
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
Deepesh Garg
0fa4143bac fix: Cess amount in GSTR 3B report 2020-07-15 18:17:38 +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
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Raffael Meyer
193e12f02a
fix: download button (#22652) 2020-07-12 17:26:27 +05:30
Sagar Vora
c9b4ba6de8 fix: ewaybill json had json dump of json dump, and other related fixes 2020-07-11 21:29:17 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Deepesh Garg
62181707ee
Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix 
fix: Update item tax only if item code available
 2020-07-03 21:25:28 +05:30
Deepesh Garg
04661a4e15 fix: Update item tax only if item code available 2020-07-03 21:23:23 +05:30
Deepesh Garg
3c004ad798 fix(GST): Do not add tax amount in grand total for reverse charge invoices 2020-07-02 21:18:29 +05:30
Anurag Mishra
c2523e8453
fixes: Payroll module pre relese test fixes (#22500) 
* fix: salary payment based on payments

* fix: bank remittance report

* fix: Payroll period onboarding

* fix: provident-fund-deductions report

* fix: Considered unmarked days

* fix: onboarding paYroll

* feat: quick entry in payroll entry
 2020-06-29 19:54:23 +05:30
Deepesh Garg
a74cffe7a4
Merge pull request #21047 from vishdha/feat_taxjar 
feat(ERPNext Integrations): Taxjar Integration Added
 2020-06-28 23:01:37 +05:30
Deepesh Garg
4c230ed4b0
Merge pull request #21690 from alyf-de/refactor_datev 
fix(regional): DATEV report
 2020-06-28 16:55:18 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Anurag Mishra
ece9508eb5 fix: test_tax_for_payroll_period 2020-06-23 14:25:43 +05:30
Anurag Mishra
f9ca29cebd Fix: if there is no component 2020-06-23 11:57:02 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev 2020-06-22 19:53:47 +02:00
Deepesh Garg
d79e8e82cb fix: Test cases 2020-06-22 10:00:12 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Deepesh Garg
0511e8cc03
Merge branch 'develop' into rcm_develop 2020-06-17 15:33:29 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
Deepesh Garg
5bf6bec656 fix: Consider Overseas category in RCM 2020-06-14 13:18:08 +05:30
Deepesh Garg
3a16b033b6 Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop 2020-06-13 22:50:14 +05:30
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Rohit Waghchaure
60c1855014 fix: import supplier invoice not working 2020-06-04 14:31:35 +05:30
Deepesh Garg
24f9a80e7d fix(India): Reverse charge mechanism for GST 2020-06-03 10:59:37 +05:30
karthikeyan5
ca46bedfcb fix(ewb): remove checksum validation for TRANSIN 2020-05-30 15:00:56 +05:30
marination
29d7a7ea05 fix: Added permission via regional setup and patch 2020-05-27 22:14:36 +05:30
marination
3da51984f2 chore: Add Import Supplier Invoice to Menu 2020-05-27 22:13:40 +05:30
Deepesh Garg
5fa207f020
fix(UAE): Incorrect VAT rate display in Sales Invoice (#21882) 2020-05-26 18:02:21 +05:30
marination
90b4452a25 fix: Supplier Invoice No not fetched in Import Supplier Invoice 2020-05-21 14:03:29 +05:30
Deepesh Garg
9a914dc592 fix: Tax amount in GSTR-1 JSON 2020-05-19 20:01:25 +05:30
Deepesh Garg
007eda7164 fix: Instate Invoice not appearing in GSTR-1 report 2020-05-19 18:59:36 +05:30
Nabin Hait
10df3d5081 fix: Get basic and hra component from db, not from cache 2020-05-14 17:15:36 +05:30
barredterra
30d194d8a7 fix: hide transaction-specific for master data 2020-05-11 19:23:54 +02:00
barredterra
53445aa25a fix: customer and supplier data 2020-05-11 19:15:49 +02:00
barredterra
2976831560 fix: truncate account names to max length 2020-05-11 19:15:03 +02:00
barredterra
55c048f56c refactor: query meta data only once 2020-05-11 18:50:02 +02:00
barredterra
7a7add5001 fix(report view): explicitly set column width for 2020-05-11 18:36:57 +02:00
SDLyu
b2eb4ee0f9
Change <br> position 
Change <br> position for better format
 2020-05-07 17:09:17 +08:00
SDLyu
e164985903
Create taiwan.html 2020-05-07 16:49:29 +08:00
Raffael Meyer
3484a79ccf
Update datev_settings.json (#21482) 2020-04-30 16:27:11 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption (#21490) 2020-04-29 11:48:41 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message 
fix: E-Way bill error message
 2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870) 
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
 2020-04-26 20:08:52 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399) 
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 17:45:57 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810) 
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:13:39 +05:30
Shivam Mishra
d9ce5843e5 chore: resolve conflicts 2020-04-13 13:43:04 +05:30
Syed Mujeer Hashmi
58a16f1a3b fix: GSTR 3B Report tax amount calculation 
The tax amount after discount amount should be considered for tax
calculation.

Fixes #21231

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-04-11 00:52:10 +05:30
Raffael Meyer
28753268e6
fix(regional): DATEV report: description in header, quote nonnumeric values (#21126) 
* fix description in header, quote nonnumeric values

* fix: truncate 'Buchungstext' to 60 chars
 2020-04-08 09:26:18 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates (#19862) 
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 08:56:57 +05:30
Deepesh Garg
6c8efdef09 fix: User permissions in GSTR 3B report 2020-04-04 20:05:17 +05:30
Raffael Meyer
b0ab3981ea
fix(regional): header row in DATEV report (#21113) 
* fix(regional): encoding of DATEV report

* feat(regional): filter datev report by voucher type

* fix: creation time, coa used, is frozen

* add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry

* fix indentation

* fix indentation

* fix indentation
 2020-03-31 10:40:03 +05:30
Shivam Mishra
1d6395c5cf feat: add PAN details field to member for India 2020-03-30 18:14:44 +05:30
Raffael Meyer
89cac5af16
fix(regional): encoding of DATEV report (#21059) 2020-03-26 13:25:58 +05:30
Deepesh Garg
113c6c86b7 fix: Remove debug 2020-03-25 16:54:17 +05:30
Deepesh Garg
878e4fbcf8 fix: Place of supply validation in GSTR-1 report 2020-03-25 16:52:07 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register 
fix: HSN code not visible in GST Itemised Purchase register
 2020-03-10 10:05:31 +05:30
Deepesh Garg
5e58666091 fix: HSN code not visible in GST Itemised Purchase register 2020-03-09 22:38:41 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup (#20853) 2020-03-09 18:07:43 +05:30
Deepesh Garg
a245a3a47f fix: HSN code no visible in GST itemised sales register 2020-03-04 10:23:49 +05:30
Deepesh Garg
cc56b690eb
Merge pull request #20582 from alyf-de/fix_datev 
fix(regional): update DATEV Export to DATEV-Format v7.0
 2020-02-19 19:36:45 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
Raffael Meyer
772394b95a fix header 2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993 update cloumn names 2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b quote format name 2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6 update TRANSACTION_COLUMNS according to "DATEV Format v7.0" 2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba update header accoding to "DATEV Format v7.0" 2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174 consutant number and client number are mandatory 2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b generated on is datetime, not date 2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb add format version (data type) 2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e bump version number 2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b EXTF must be in quotes 2020-02-13 17:02:01 +01:00
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code (#20500) 
* fix: gst permission for gst settings & hsn code

* Fix: typo

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-03 15:40:35 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pawan Mehta
687cbc7c0c fix: #20314 2020-01-15 23:44:36 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
Rohit Waghchaure
2469fb9e35 fix: rounded total issue 2019-12-26 13:26:39 +05:30
Pawan Mehta
6e1ba43c3c code fixes 2019-12-26 12:14:33 +05:30
Rohit Waghchaure
2c13a0533b code cleanup 2019-12-26 12:14:32 +05:30
Pawan Mehta
bc40161d08 add ignore mandatory flag 2019-12-26 12:13:27 +05:30
Pawan Mehta
c3bb04ccb8 code improvements 2019-12-26 12:13:27 +05:30
hello@openetech.com
39b54cb889 validation change 2019-12-26 12:13:27 +05:30
hello@openetech.com
e9377e2513 review changes 2019-12-26 12:13:27 +05:30
hello@openetech.com
eb87566fa6 log encoding exception 2019-12-26 12:13:27 +05:30
hello@openetech.com
9e0762e8c2 code review changes 2019-12-26 12:13:27 +05:30
hello@openetech.com
5b33765a8c discount handling 2019-12-26 12:13:27 +05:30
hello@openetech.com
90f170c376 code improvement 2019-12-26 12:13:27 +05:30
hello@openetech.com
c8e64235c0 codacy fixes 2019-12-26 12:13:27 +05:30
hello@openetech.com
309913bbdf fix codacy issues 2019-12-26 12:13:27 +05:30
hello@openetech.com
5fadd355df add naming series option 2019-12-26 12:13:27 +05:30
hello@openetech.com
fa8159efa3 mop options fix 2019-12-26 12:13:27 +05:30
hello@openetech.com
9964ad7870 python 2.7 fixes 2019-12-26 12:13:27 +05:30