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

fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled #42050

Merged
merged 9 commits into from
Jul 26, 2024
Merged

fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled #42050

merged 9 commits into from
Jul 26, 2024

Conversation

Ninad1306
Copy link
Contributor

@Ninad1306 Ninad1306 commented Jun 27, 2024 •
edited

  • If a Sales Invoice is created for internal transfers rate of item is updated to valuation rate.

image

  • Instead it should be a Setting.

image

  • For taxation purposes, (eg: Multi-GSTIN Setup) transfer from one branch to another should be at arm's length price, and GST on the same should be payable to Govt.
  • However, a company cannot book profits by making sale to oneself.

Hence allowing Item Rate to be different from Valuation Rate.

Accounting

  • Always books stock entry and accounting at Valuation rate
  • If setting is enabled, Sales/Purchase document can be with different item rate (than valuation rate) for correct taxation and compliance.

Helpdesk Ref: https://support.frappe.io/helpdesk/tickets/14425

@github-actions github-actions bot added buying needs-tests This PR needs automated unit-tests. selling labels Jun 27, 2024
@Ninad1306 Ninad1306 force-pushed the dont_update_rate_for_internal_transfers branch from f80541c to bed6f45 Compare June 27, 2024 06:21
@Ninad1306 Ninad1306 requested a review from vorasmit July 12, 2024 12:00
@vorasmit vorasmit added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Jul 19, 2024
@vorasmit vorasmit added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Jul 26, 2024
@vorasmit vorasmit merged commit 723ac0f into frappe:develop Jul 26, 2024
13 checks passed
mergify bot pushed a commit that referenced this pull request Jul 26, 2024
@Ninad1306 @mergify
fix: Update Rate as per Valuation Rate for Internal Transfers only if…
6e833cc 
… Setting is Enabled (#42050)

* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <[email protected]>
(cherry picked from commit 723ac0f)
mergify bot pushed a commit that referenced this pull request Jul 26, 2024
@Ninad1306 @mergify
fix: Update Rate as per Valuation Rate for Internal Transfers only if…
f1cc770 
… Setting is Enabled (#42050)

* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <[email protected]>
(cherry picked from commit 723ac0f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
#	erpnext/controllers/buying_controller.py
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
#	erpnext/stock/doctype/stock_settings/stock_settings.json
#	erpnext/stock/doctype/stock_settings/stock_settings.py
This was referenced Jul 26, 2024
Closed
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r s-aga-r is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

@vorasmit vorasmit Awaiting requested review from vorasmit

Assignees
No one assigned
Labels
backport version-14-hotfix backport to version 14 backport version-15-hotfix buying needs-tests This PR needs automated unit-tests. selling
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ninad1306 @vorasmit