From 1a78a3244bf6a8f77a87992a61fa4cd1d2269a64 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 23 Jun 2017 18:37:08 +0530 Subject: [PATCH] removed conflicts --- .../docs/user/manual/en/stock/item/index.md | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md index 58636dd94b4..b8b5fd660ca 100644 --- a/erpnext/docs/user/manual/en/stock/item/index.md +++ b/erpnext/docs/user/manual/en/stock/item/index.md @@ -52,11 +52,7 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Purchase Details -<<<<<<< HEAD -Item Purchase Details -======= Purchase details ->>>>>>> Edited help page * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. @@ -76,31 +72,19 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Sales Details -<<<<<<< HEAD Item Sales Details * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. -======= - -<<<<<<< HEAD -Sales details ->>>>>>> Edited help page -======= -Sales details ->>>>>>> Modified help pages * **Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item. * **Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order. +Sales details + ### Manufacturing And Website -<<<<<<< HEAD -Item Manfacturing and Website Details -======= - Manufaturing details ->>>>>>> Edited help page Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.