CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-28 23:51:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2025-01-27 22:01:13 +05:30
parent c102e51eb1
commit 57f79a2240
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -650,15 +650,11 @@ class JobCard(Document):
) )
) )
<<<<<<< HEAD
if self.get("operation") == d.operation:
=======
if ( if (
self.get("operation") == d.operation self.get("operation") == d.operation
or self.operation_row_id == d.operation_row_id or self.operation_row_id == d.operation_row_id
or self.is_corrective_job_card or self.is_corrective_job_card
): ):
>>>>>>> 2bf10f68a8 (feat: Add corrective job card operating cost as additional costs in stock entry)
self.append( self.append(
"items", "items",
{ {

4
erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
View File

@@ -75,11 +75,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-05-17 13:57:10.807980",
=======
"modified": "2025-01-20 12:22:03.455762", "modified": "2025-01-20 12:22:03.455762",
>>>>>>> 47f8a86003 (fix: logical error in where condition of qb query)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Landed Cost Taxes and Charges", "name": "Landed Cost Taxes and Charges",