Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: RCM for Sales Transaction #2063

Merged
merged 19 commits into from
Jul 2, 2024
Merged

feat: RCM for Sales Transaction #2063

merged 19 commits into from
Jul 2, 2024

Conversation

ljain112
Copy link
Collaborator

@ljain112 ljain112 commented Apr 23, 2024 •
edited by vorasmit
Loading

Closes: #1800

No Patch to create templates

Templates may need to be created and updated in GST Settings Manually.

  • No use of template if RCM in sales is not applicable
  • RCM Accounts may already exist for other cases. There could be multiple variable factors like GST Rate, Tax Category etc.
  • Still updating of this in Item Tax Template will need to be manual as it's used differently by different companies.

@ljain112 ljain112 requested a review from vorasmit April 30, 2024 07:26
@vorasmit
Copy link
Member

vorasmit commented May 1, 2024 •
edited
Loading

  • Refactor Validate Accounts
  • Consistent backend for is GST Applicable
  • Test Cases
  • Docs

@codecov Codecov
Copy link

codecov bot commented May 1, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 86.39053% with 23 lines in your changes missing coverage. Please review.

Project coverage is 61.36%. Comparing base (6760eab) to head (687b72e).
Report is 9 commits behind head on develop.

Files Patch % Lines
...ompliance/gst_india/overrides/item_tax_template.py 41.17% 10 Missing ⚠️
...ndia_compliance/gst_india/overrides/transaction.py 93.38% 8 Missing ⚠️
...compliance/gst_india/overrides/purchase_invoice.py 75.00% 3 Missing ⚠️
india_compliance/gst_india/utils/e_invoice.py 50.00% 1 Missing ⚠️
...dia_compliance/gst_india/utils/transaction_data.py 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #2063      +/-   ##
===========================================
+ Coverage    61.23%   61.36%   +0.12%     
===========================================
  Files          112      112              
  Lines        10768    10853      +85     
===========================================
+ Hits          6594     6660      +66     
- Misses        4174     4193      +19

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ljain112
ljain112 commented May 6, 2024
View reviewed changes
india_compliance/patches/post_install/update_sales_rcm_accounts.py Outdated
update_account_name(gst_accounts, account_names, taxes)
update_tax_rate(gst_rate, taxes)

make_taxes_and_charges_template(
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already handling

@ljain112 ljain112 added the p1 label May 29, 2024
@vorasmit vorasmit self-assigned this Jul 2, 2024
@vorasmit vorasmit merged commit 7458c97 into resilient-tech:develop Jul 2, 2024
10 of 12 checks passed
@vorasmit vorasmit deleted the rcm-for-sales branch July 2, 2024 09:17
mergify bot pushed a commit that referenced this pull request Jul 2, 2024
@ljain112 @mergify
feat: RCM for Sales Transaction (#2063)
727d6a3 
* fix: rename "Reverse Charge" to "Purchase Reverse Charge"

* fix: new gst account type "Sales Reverse Charge"

* fix: modify test casess

* fix: use both rcm accounts in item tax template validation

* refactor: validate gst accounts and rcm validation

* fix: changes as per review

* fix: test case and get_applicable_gst_accounts

* fix: patch updated to use database value

* fix: e-Invoice and e-Waybill trials for rcm

* fix: changes as per review

* fix: refactor

* fix: resolve conflicts and refactor gst account validation

* fix: correct field name

* fix: validate rcm transaction

* fix: better validation for tax rate in item tax template

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 7458c97)

# Conflicts:
#	india_compliance/gst_india/overrides/transaction.py
mergify bot pushed a commit that referenced this pull request Jul 2, 2024
@ljain112 @mergify
feat: RCM for Sales Transaction (#2063)
fe58c25 
* fix: rename "Reverse Charge" to "Purchase Reverse Charge"

* fix: new gst account type "Sales Reverse Charge"

* fix: modify test casess

* fix: use both rcm accounts in item tax template validation

* refactor: validate gst accounts and rcm validation

* fix: changes as per review

* fix: test case and get_applicable_gst_accounts

* fix: patch updated to use database value

* fix: e-Invoice and e-Waybill trials for rcm

* fix: changes as per review

* fix: refactor

* fix: resolve conflicts and refactor gst account validation

* fix: correct field name

* fix: validate rcm transaction

* fix: better validation for tax rate in item tax template

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 7458c97)

# Conflicts:
#	india_compliance/gst_india/overrides/transaction.py
#	india_compliance/patches.txt
This was referenced Jul 2, 2024
Merged
Merged
vorasmit added a commit that referenced this pull request Jul 2, 2024
@vorasmit
Merge pull request #2330 from resilient-tech/mergify/bp/version-15-ho…
fc95c03 
…tfix/pr-2063

feat: RCM for Sales Transaction (backport #2063)
vorasmit added a commit that referenced this pull request Jul 2, 2024
@vorasmit
Merge pull request #2329 from resilient-tech/mergify/bp/version-14-ho…
cf5c6f1 
…tfix/pr-2063

feat: RCM for Sales Transaction (backport #2063)
india-compliance-bot added a commit that referenced this pull request Jul 5, 2024
@india-compliance-bot
chore(release): Bumped to Version 15.10.0
43ee1a3 
# [15.10.0](v15.9.2...v15.10.0) (2024-07-05)

### Bug Fixes

* add_negative_other_charge_to_discount_amount ([6913e64](6913e64))
* do not execute patch if field does not exists ([64360f1](64360f1))
* do not throw for gst accounts if GST Accounts are not set ([11f6bb7](11f6bb7))
* fallback for HSN summary to item_name for key ([9610b44](9610b44))
* filter cess non advol accounts correctly ([a93db2c](a93db2c))
* GST Tax Type in Journal Entry ([#2328](#2328)) ([1dad658](1dad658)), closes [#2300](#2300)
* inconsistant keys for e-Waybill JSON with API ([96feb9e](96feb9e))
* return payment entries if no taxes in regional override ([abffc7a](abffc7a))

### Features

* introduce new APIs for e-Invoice data ([#2340](#2340)) ([5e4f3f2](5e4f3f2))
* RCM for Sales Transaction ([#2063](#2063)) ([727d6a3](727d6a3))
india-compliance-bot added a commit that referenced this pull request Jul 5, 2024
@india-compliance-bot
chore(release): Bumped to Version 14.29.0
49cb89f 
# [14.29.0](v14.28.1...v14.29.0) (2024-07-05)

### Bug Fixes

* add_negative_other_charge_to_discount_amount ([88e0a66](88e0a66))
* do not throw for gst accounts if GST Accounts are not set ([4db9dd6](4db9dd6))
* fallback for HSN summary to item_name for key ([87ca7a9](87ca7a9))
* filter cess non advol accounts correctly ([1c2f93b](1c2f93b))
* GST Tax Type in Journal Entry ([#2328](#2328)) ([9a75aab](9a75aab)), closes [#2300](#2300)
* inconsistant keys for e-Waybill JSON with API ([eefab13](eefab13))
* return payment entries if no taxes in regional override ([a04e8c3](a04e8c3))

### Features

* introduce new APIs for e-Invoice data ([#2340](#2340)) ([d972614](d972614))
* RCM for Sales Transaction ([#2063](#2063)) ([fe58c25](fe58c25))
@rehandev26
Copy link

Getting an error while installing?? @vorasmit @sagarvora

image

@sagarvora
Copy link
Member

Getting an error while installing?? @vorasmit @sagarvora

@rehandev26 This was fixed in a newer version. Sorry for the inconvenience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vorasmit vorasmit vorasmit left review comments

Assignees

@vorasmit vorasmit

Labels
backport version-14-hotfix backport version-15-hotfix p1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Should RCM Sales be classified as Nil Rated? Related Fixes for GST Treatment
4 participants
@ljain112 @vorasmit @rehandev26 @sagarvora