chore: resolve conflict

2026-08-11 21:51:48 +00:00 · 2026-08-07 22:28:30 +05:30
parent 206ed28924
commit 2cd8e39f04
14 changed files with 0 additions and 56 deletions
--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -859,11 +859,7 @@
 ],
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-20 16:16:12.322024",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "POS Invoice Item",
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -1018,11 +1018,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-05-06 08:08:40.782395",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Purchase Invoice Item",
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1037,11 +1037,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-06-03 13:17:36.145788",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice Item",
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -262,11 +262,7 @@
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-01-31 19:46:27.884592",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Request for Quotation Item",
--- a/erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+++ b/erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
@@ -218,11 +218,7 @@
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-06-16 16:49:19.000000",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Manufacturing",
 "name": "BOM Secondary Item",
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -712,11 +712,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-01-30 12:56:08.320190",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Quotation Item",
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -1036,11 +1036,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-02-22 16:40:00.200328",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Sales Order Item",
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -953,11 +953,7 @@
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-07 15:43:20.892151",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Delivery Note Item",
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -316,11 +316,7 @@
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-27 14:12:53.236906",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Packed Item",
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -297,11 +297,7 @@
 ],
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-07-06 18:17:18.000000",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Pick List Item",
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -1150,11 +1150,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-29 16:01:34.154697",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Purchase Receipt Item",
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -690,11 +690,7 @@
 "index_web_pages_for_search": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-07-06 18:17:18.000000",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Stock Entry Detail",
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -636,11 +636,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2026-03-09 15:11:16.977539",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Subcontracting",
 "name": "Subcontracting Receipt Item",
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -265,11 +265,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2025-05-27 12:33:58.772638",
-=======
 "modified": "2026-08-07 17:31:31.732720",
->>>>>>> 69a35a12cb (fix: declare precision 9 on all conversion_factor fields)
 "modified_by": "Administrator",
 "module": "Subcontracting",
 "name": "Subcontracting Receipt Supplied Item",