From 57f79a22401ec1ffadb8ae4a7dddea5236e213db Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 27 Jan 2025 22:01:13 +0530 Subject: [PATCH] fix: merge conflict --- erpnext/manufacturing/doctype/job_card/job_card.py | 4 ---- .../landed_cost_taxes_and_charges.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 893c698ff5f..50bec328620 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -650,15 +650,11 @@ class JobCard(Document): ) ) -<<<<<<< HEAD - if self.get("operation") == d.operation: -======= if ( self.get("operation") == d.operation or self.operation_row_id == d.operation_row_id or self.is_corrective_job_card ): ->>>>>>> 2bf10f68a8 (feat: Add corrective job card operating cost as additional costs in stock entry) self.append( "items", { diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json index 2d5823d3d51..898848ebf42 100644 --- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json +++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json @@ -75,11 +75,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2021-05-17 13:57:10.807980", -======= "modified": "2025-01-20 12:22:03.455762", ->>>>>>> 47f8a86003 (fix: logical error in where condition of qb query) "modified_by": "Administrator", "module": "Stock", "name": "Landed Cost Taxes and Charges",