From e19abb162a67656cba0cd0788e45ae3ee2ed85ae Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sat, 1 Jun 2019 23:26:09 +0530
Subject: [PATCH] fix: Resolve merge conflicts in purchase_receipt_item

---
 .../purchase_receipt_item.json                     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 ad5ee7b24d..66df86bcf4 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -79,10 +79,7 @@
   "batch_no",
   "column_break_48",
   "rejected_serial_no",
-  "section_break_50",
-  "project",
   "expense_account",
-  "cost_center",
   "col_break5",
   "allow_zero_valuation_rate",
   "bom",
@@ -782,11 +779,20 @@
    "label": "Expense Account",
    "options": "Account",
    "read_only": 1
+  },
+  {
+   "fieldname": "accounting_dimensions_section",
+   "fieldtype": "Section Break",
+   "label": "Accounting Dimensions"
+  },
+  {
+   "fieldname": "dimension_col_break",
+   "fieldtype": "Column Break"
   }
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-05-30 18:09:21.648599",
+ "modified": "2019-06-01 23:25:20.732134",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",