Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues

[Enhancement] POS features
2017-01-04 15:15:32 +05:30
parent 1d88c65be4 bef185c404
commit 202bcc09d5
7 changed files with 146 additions and 83 deletions
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -17,7 +17,13 @@
        </div>
    </div>
    <div class="col-xs-3 text-right">
-        <div class="text-muted" style="margin-top: 5px;"><input type="text" value="{%= rate %}" class="form-control input-sm pos-item-rate text-right"></div>
+        <div class="text-muted" style="margin-top: 5px;">
+			{% if(enabled) { %}
+				<input type="text" value="{%= rate %}" class="form-control input-sm pos-item-rate text-right">
+			{% } else { %}
+				<h6>{%= format_currency(rate) %}</h6>
+			{% } %}
+		</div>
 		<p><h6>{%= amount %}</h6></p>
    </div>
 </div>