Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts in index.md

Browse Source
This commit is contained in:
Frappe 2017-06-30 00:13:59 +05:30
parent 79918c66c2
commit 67bbcf6932
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,15 @@ 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 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 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.
@ -75,9 +83,23 @@ 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">
>>>>>>> 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.
@ -85,18 +107,9 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
<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)">
<<<<<<< HEAD
### Manufacturing And Website ### Manufacturing And Website
<img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png"> <img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
=======
<img alt="Item Manfacturing and Website Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-and-website.png">
=======
<img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
>>>>>>> Deleted old Images and added Global Search 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. 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.