fix(Purchase Receipt): calculate stock_value_diff
#39868
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`d.item_tax_amount` is already in base currency.
barredterra
requested review from
rohitwaghchaure and
s-aga-r
as code owners
barredterra
added
backport version-14-hotfix
barredterra
force-pushed
the
fix-stock-value-diff
branch
2 times, most recently
from
8ff180a to
5df5851
Compare
barredterra
changed the title
stock_value_diffstock_value_diff
|
Tested with Purchase Receipts in foreign currency and base currency; seems good to merge. |
This was referenced Feb 13, 2024
barredterra
added a commit
that referenced
this pull request
Feb 14, 2024
…-39868 fix(Purchase Receipt): calculate `stock_value_diff` (backport #39868)
barredterra
added a commit
that referenced
this pull request
Feb 14, 2024
…-39868 fix(Purchase Receipt): calculate `stock_value_diff` (backport #39868)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
d.item_tax_amountis already in base currency. Dividing it by conversion rate here will lead to a mismatch in debit / credit values.Reproduce:
Error:
Example Data
{ "name": "MAT-PRE-2024-00021", "owner": "Administrator", "creation": "2024-02-12 17:11:06.506708", "modified": "2024-02-12 17:12:17.533632", "modified_by": "Administrator", "docstatus": 0, "idx": 0, "title": "Supplier Ltd", "naming_series": "MAT-PRE-.YYYY.-", "supplier": "001", "supplier_name": "Supplier Ltd", "posting_date": "2024-02-12", "posting_time": "17:12:18.275081", "set_posting_time": 0, "company": "_Test Company", "apply_putaway_rule": 0, "is_return": 0, "currency": "USD", "conversion_rate": 0.92825, "buying_price_list": "Standard Buying", "price_list_currency": "EUR", "plc_conversion_rate": 1, "ignore_pricing_rule": 0, "is_subcontracted": 0, "total_qty": 1, "total_net_weight": 0, "base_total": 92.83, "base_net_total": 92.83, "total": 100, "net_total": 100, "tax_category": "", "base_taxes_and_charges_added": 9.28, "base_taxes_and_charges_deducted": 0, "base_total_taxes_and_charges": 9.28, "taxes_and_charges_added": 10, "taxes_and_charges_deducted": 0, "total_taxes_and_charges": 10, "base_grand_total": 102.11, "base_rounding_adjustment": 0, "base_rounded_total": 102.11, "base_in_words": "", "grand_total": 110, "rounding_adjustment": 0, "rounded_total": 110, "in_words": "", "disable_rounded_total": 0, "apply_discount_on": "Grand Total", "base_discount_amount": 0, "additional_discount_percentage": 0, "discount_amount": 0, "status": "Draft", "per_billed": 0, "per_returned": 0, "letter_head": "Standard", "group_same_items": 0, "language": "en", "is_internal_supplier": 0, "represents_company": "", "is_old_subcontracting_flow": 0, "doctype": "Purchase Receipt", "pricing_rules": [], "supplied_items": [], "taxes": [ { "name": "054d3c9c3e", "owner": "Administrator", "creation": "2024-02-12 17:11:06.506708", "modified": "2024-02-12 17:12:17.533632", "modified_by": "Administrator", "docstatus": 0, "idx": 1, "category": "Valuation and Total", "add_deduct_tax": "Add", "charge_type": "Actual", "included_in_print_rate": 0, "included_in_paid_amount": 0, "account_head": "Freight - _TC", "description": "", "rate": 0, "cost_center": "Other - _TC", "account_currency": "EUR", "tax_amount": 10, "tax_amount_after_discount_amount": 10, "total": 110, "base_tax_amount": 9.28, "base_total": 102.11, "base_tax_amount_after_discount_amount": 9.28, "item_wise_tax_detail": "{\"STO-ITEM-00001\":[0,9.28]}", "parent": "MAT-PRE-2024-00021", "parentfield": "taxes", "parenttype": "Purchase Receipt", "doctype": "Purchase Taxes and Charges", "__unsaved": 1 } ], "items": [ { "name": "f994f21859", "owner": "Administrator", "creation": "2024-02-12 17:11:06.506708", "modified": "2024-02-12 17:12:17.533632", "modified_by": "Administrator", "docstatus": 0, "idx": 1, "has_item_scanned": 0, "item_code": "STO-ITEM-00001", "item_name": "My Asset", "description": "<div><p>My Asset</p></div>", "brand": "", "item_group": "All Item Groups", "image": "", "received_qty": 1, "qty": 1, "rejected_qty": 0, "uom": "St", "stock_uom": "St", "conversion_factor": 1, "retain_sample": 0, "sample_quantity": 0, "received_stock_qty": 1, "stock_qty": 1, "returned_qty": 0, "price_list_rate": 0, "base_price_list_rate": 0, "margin_type": "", "margin_rate_or_amount": 0, "rate_with_margin": 0, "discount_percentage": 0, "discount_amount": 0, "base_rate_with_margin": 0, "rate": 100, "amount": 100, "base_rate": 92.83, "base_amount": 92.83, "stock_uom_rate": 100, "is_free_item": 0, "net_rate": 100, "net_amount": 100, "base_net_rate": 92.83, "base_net_amount": 92.83, "valuation_rate": 102.11, "item_tax_amount": 0, "rm_supp_cost": 0, "landed_cost_voucher_amount": 0, "rate_difference_with_purchase_invoice": 0, "billed_amt": 0, "warehouse": "Stores", "is_fixed_asset": 1, "asset_location": "Main", "asset_category": "Main", "schedule_date": "2024-02-01", "allow_zero_valuation_rate": 0, "include_exploded_items": 0, "item_tax_rate": "{}", "weight_per_unit": 0, "total_weight": 0, "expense_account": "COGS - _TC", "cost_center": "Other - _TC", "page_break": 0, "parent": "MAT-PRE-2024-00021", "parentfield": "items", "parenttype": "Purchase Receipt", "doctype": "Purchase Receipt Item", "__unsaved": 1 } ], "__onload": { "make_payment_via_journal_entry": 0, "backflush_based_on": "Material Transferred for Subcontract" } }The error is resolved with this PR.
Not sure how to add a good test for this – I can't even make the existing tests pass locally.