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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-02-22 14:47:26 +05:30
parent cad22dbe39 15bd3167a8
commit cf72d7f135
38 changed files with 351 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/docs/user/manual/en/accounts/pricing-rule.md
View File

@@ -52,7 +52,6 @@ Using Price List Rule, you can ultimately define rate or %discount to be applied
Rate or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Rate mentioned in Pricing Rule will be given priority over item's Price List rate.
<img alt="Applicable Rate" class="screenshot" src="/docs/assets/img/articles/pricing-rule-price.png">
>>>>>>> Renamed price to rate in pricing rule
#### 2.2 Discount Percentage