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

removed conflicts

Browse Source
This commit is contained in:
Makarand Bauskar 2017-06-23 18:37:08 +05:30 committed by GitHub
parent 1d962dd3f7
commit 1a78a3244b
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,11 +52,7 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Purchase Details
<<<<<<< HEAD
<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">
>>>>>>> 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
<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.
=======
<<<<<<< HEAD
<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
>>>>>>> Edited help page
=======
<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
>>>>>>> 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.
<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
### Manufacturing And Website
<<<<<<< HEAD
<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">
>>>>>>> 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.