[fix] fixed merge conflict

This commit is contained in:
Nabin Hait
2013-10-17 17:01:14 +05:30
parent 46eaa55f06
commit 096d363087
18 changed files with 130 additions and 108 deletions

View File

@@ -20,7 +20,7 @@ An Item can have multiple prices based on customer, currency, region, shipping c
> Setup > Item Price
- Enter Price List and Item Code, Valid for Buying or Selling, Item Name & Item Description will be automatically fetched.
- Enter Price List and Item Code, Valid for Buying or Selling, Item Name and Item Description will be automatically fetched.
- Enter Rate and save the document.
![Item-Price](img/item-price.png)