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

resolved conflicts

Browse Source
This commit is contained in:
Makarand Bauskar
2017-07-03 16:24:01 +05:30
committed by GitHub
parent 67bbcf6932
commit 87f2848aeb
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/docs/user/manual/en/stock/item/index.md
View File

@@ -55,16 +55,10 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Purchase Details ### Purchase Details
<<<<<<< HEAD
<img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
=======
<img alt="Item Purchase Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-purchase.png"> <img alt="Item Purchase Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
<img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png"> <img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
>>>>>>> Resolved conflicts in index.md
* **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. * **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. * **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 ### Sales Details
<<<<<<< HEAD
<img alt="Item Sales Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-sales.png"> <img alt="Item Sales Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
=======
<img alt="Item Sales Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)"> <img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png"> <img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
>>>>>>> Resolved conflicts in index.md
***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item. ***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.