mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 19:29:10 +00:00
fix: set landed cost based on purchase invoice rate
(cherry picked from commit 17d415b105)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
# erpnext/patches.txt
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
This commit is contained in:
@@ -261,7 +261,11 @@ erpnext.patches.v14_0.show_loan_management_deprecation_warning
|
||||
erpnext.patches.v14_0.clear_reconciliation_values_from_singles
|
||||
execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Details", force=True)
|
||||
erpnext.patches.v14_0.update_proprietorship_to_individual
|
||||
<<<<<<< HEAD
|
||||
erpnext.patches.v15_0.rename_subcontracting_fields
|
||||
=======
|
||||
erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference
|
||||
>>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate)
|
||||
|
||||
[post_model_sync]
|
||||
erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets
|
||||
@@ -393,8 +397,12 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect
|
||||
erpnext.patches.v15_0.sync_auto_reconcile_config
|
||||
execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment")
|
||||
erpnext.patches.v14_0.disable_add_row_in_gross_profit
|
||||
<<<<<<< HEAD
|
||||
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
|
||||
erpnext.patches.v14_0.update_posting_datetime
|
||||
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
|
||||
erpnext.patches.v15_0.rename_sla_fields
|
||||
erpnext.patches.v15_0.update_query_report
|
||||
=======
|
||||
erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field
|
||||
>>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate)
|
||||
|
||||
Reference in New Issue
Block a user