nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed fields related to job card and landed cost voucher amount from subcontracting receipt item.
This commit is contained in:
rohitwaghchaure
2025-09-27 10:03:27 +05:30
committed by GitHub
parent c26ed80d67
commit cecd177286
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
View File

@@ -582,23 +582,6 @@
"fieldname": "add_serial_batch_for_rejected_qty", "fieldname": "add_serial_batch_for_rejected_qty",
"fieldtype": "Button", "fieldtype": "Button",
"label": "Add Serial / Batch No (Rejected Qty)" "label": "Add Serial / Batch No (Rejected Qty)"
<<<<<<< HEAD
=======
},
{
"fieldname": "job_card",
"fieldtype": "Link",
"label": "Job Card",
"options": "Job Card",
"read_only": 1,
"search_index": 1
},
{
"fieldname": "landed_cost_voucher_amount",
"fieldtype": "Currency",
"label": "Landed Cost Voucher Amount",
"no_copy": 1,
"read_only": 1
}, },
{ {
"fieldname": "column_break_exht", "fieldname": "column_break_exht",
@@ -609,17 +592,12 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Service Expense Account", "label": "Service Expense Account",
"options": "Account" "options": "Account"
>>>>>>> 6e597b9c42 (feat: service expense account in the subcontracting receipt)
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-12-06 15:23:58.680169",
=======
"modified": "2025-09-26 12:00:38.877638", "modified": "2025-09-26 12:00:38.877638",
>>>>>>> 6e597b9c42 (feat: service expense account in the subcontracting receipt)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Subcontracting", "module": "Subcontracting",
"name": "Subcontracting Receipt Item", "name": "Subcontracting Receipt Item",