Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade ( #25220 )
2021-04-07 10:57:46 +05:30
Kaviya Periyasamy
2cef23d4c9
fix: object referencing the same address issue ( #25159 )
...
* 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 ( #25153 )
2021-04-02 15:04:48 +05:30
Saqib
5447b250fe
fix: place of supply of e-invoicing ( #25148 )
2021-04-02 12:16:19 +05:30
Afshan
ace4ce64a0
fix: validation msg for TransDocNo e-invoicing ( #25121 )
2021-04-01 20:28:12 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series ( #25134 )
2021-04-01 16:52:28 +05:30
Sagar Vora
4c31fbb687
fix(India): create property setters for shorter naming series (as per GST Rules) ( #25128 )
2021-04-01 15:32:37 +05:30
Rucha Mahabal
6717773c28
fix: Travis ( #25078 )
...
* fix(test): set default accounts in mode of payment
* fix(test): import_doc params in shopify settings test
* fix: syntax error in salary slip test
* fix(test): use Temporary Opening account for Stock Reco opening entry
* fix(test): skip GST doc naming validations for tests
* fix(test): Salary Structure Assignment date edge case
* fix(test): GST doc naming validations
* fix: sider
* revert: skip GST doc naming validations for tests
2021-04-01 15:30:34 +05:30
Nabin Hait
11eb30d082
fix: merge conflict
2021-04-01 15:03:11 +05:30
Deepesh Garg
21a3ea462a
fix: Purchase from registered composition dealer ( #25040 )
...
* fix: Purchase from registered composition dealer
* fix: Test case for GSTR 3b report
2021-03-31 16:05:12 +05:30
Deepesh Garg
c482c9592f
fix: Purchase from registered composition dealer ( #25057 )
...
* fix: Purchase from registered composition dealer
* fix: Test case for GSTR 3b report
2021-03-31 16:04:46 +05:30
Sagar Vora
368cb45147
fix(Italy): setup, validations, optimisations ( #25065 )
2021-03-31 12:43:33 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Deepesh Garg
6be78db62c
Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta
...
feat: Normal rounding for GST Taxes
2021-03-30 17:01:45 +05:30
Rucha Mahabal
30f67c3f57
fix: add filters to account link fields in Non Profit Settings ( #25060 )
...
- fetch memberships ordered by date in certificate
2021-03-30 12:39:56 +05:30
Rucha Mahabal
04c0296558
fix: add filters to account link fields in Non Profit Settings
...
- fetch memberships ordered by date in certificate
2021-03-30 12:30:40 +05:30
Rucha Mahabal
146cbb10f8
fix: calculate 80g certificate amount on validate for memberships ( #24925 )
2021-03-30 12:02:28 +05:30
Rucha Mahabal
5f4a2bfc61
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-30 12:02:09 +05:30
Sagar Vora
7f43c051df
fix(Italy): setup, validations, optimisations
2021-03-29 21:18:26 +05:30
Sagar Vora
ba76f87e44
fix(Italy): setup, validations, optimisations ( #25054 )
...
* fix(Italy): setup, validations, optimisations
* fix: remove unused import
2021-03-29 20:18:45 +05:30
Deepesh Garg
29997414ad
fix: Add GST category field in Dellivery Note
2021-03-29 19:49:52 +05:30
Deepesh Garg
237033704f
fix: Add test case
2021-03-29 16:42:59 +05:30
Deepesh Garg
c2548ddc75
feat: Normal rounding for GST Taxes
2021-03-29 16:42:47 +05:30
walstanb
ab673d9e4b
fix: minor changes
2021-03-27 12:54:49 +05:30
walstanb
52403c537b
fix: check if gst account exists before appending
2021-03-27 12:54:49 +05:30
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