From 87f2848aebfd1677a7900cd6350fa604d4bc9863 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Mon, 3 Jul 2017 16:24:01 +0530 Subject: [PATCH] resolved conflicts --- erpnext/docs/user/manual/en/stock/item/index.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md index 4c39edd3e9..aea38f5258 100644 --- a/erpnext/docs/user/manual/en/stock/item/index.md +++ b/erpnext/docs/user/manual/en/stock/item/index.md @@ -55,16 +55,10 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Purchase Details -<<<<<<< HEAD -Purchase details -======= - Item Purchase Details Purchase details ->>>>>>> Resolved conflicts in index.md - * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. * **Default Expense Account:** It is the account in which cost of the Item will be debited. @@ -83,23 +77,13 @@ 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. -======= - -Item Sales Details - -* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. - Sales details - Sales details ->>>>>>> Resolved conflicts in index.md - ***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.