From 941d67a0b63b8010473f735a65cf73d36ae57846 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Mar 2025 14:48:41 +0530 Subject: [PATCH] chore: resolve conflicts --- .../purchase_invoice/test_purchase_invoice.py | 4 +--- erpnext/patches.txt | 12 ------------ .../purchase_receipt_item/purchase_receipt_item.json | 9 --------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py index be6206965e0..e2386122522 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -2464,7 +2464,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin): frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 1) -<<<<<<< HEAD def test_last_purchase_rate(self): item = create_item("_Test Item For Last Purchase Rate from PI", is_stock_item=1) pi1 = make_purchase_invoice(item_code=item.item_code, qty=10, rate=100) @@ -2482,7 +2481,7 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin): pi1.cancel() item.reload() self.assertEqual(item.last_purchase_rate, 0) -======= + def test_adjust_incoming_rate_from_pi_with_multi_currency_and_partial_billing(self): frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 0) @@ -2552,7 +2551,6 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin): frappe.db.set_single_value("Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 0) frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 1) ->>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate) def test_opening_invoice_rounding_adjustment_validation(self): pi = make_purchase_invoice(do_not_save=1) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index e0a1fcf3cbf..18feaa19ee5 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -400,22 +400,10 @@ 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 -<<<<<<< HEAD -<<<<<<< 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) -======= -erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference -erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field ->>>>>>> 154e9813c4 (fix: revert last commit) -======= erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference erpnext.patches.v15_0.recalculate_amount_difference_field ->>>>>>> 1230127d24 (fix: patch) diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index 2f6598c3fb2..12d3f99e37b 100644 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -1127,14 +1127,6 @@ "no_copy": 1, "options": "Company:company:default_currency", "print_hide": 1 -<<<<<<< HEAD -======= - }, - { - "fieldname": "distributed_discount_amount", - "fieldtype": "Currency", - "label": "Distributed Discount Amount", - "options": "currency" }, { "fieldname": "amount_difference_with_purchase_invoice", @@ -1143,7 +1135,6 @@ "no_copy": 1, "print_hide": 1, "read_only": 1 ->>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate) } ], "idx": 1,