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

Merge pull request #11089 from rohitwaghchaure/offline_pos_v9

Browse Source 
[Fix] Discount field not displaying in offline POS
This commit is contained in:
rohitwaghchaure 2017-10-06 09:51:30 +05:30 committed by GitHub
commit 1b0f3ec666
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/pos.py
View File

@ -88,7 +88,7 @@ def update_pos_profile_data(doc, pos_profile, company_data):
doc.naming_series = pos_profile.get('naming_series') or 'SINV-' doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0 doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else '' doc.apply_discount_on = pos_profile.get('apply_discount_on') or ''
doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group') doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
doc.territory = pos_profile.get('territory') or get_root('Territory') doc.territory = pos_profile.get('territory') or get_root('Territory')
doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or '' doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or ''

2
erpnext/public/js/pos/pos.html
View File

@ -37,7 +37,6 @@
<div class="cell price-cell text-right tax-table"> <div class="cell price-cell text-right tax-table">
</div> </div>
</div> </div>
{% if (apply_discount_on) { %}
<div class="pos-list-row discount-amount-area"> <div class="pos-list-row discount-amount-area">
<div class="cell"></div> <div class="cell"></div>
<div class="cell text-right">{%= __("Discount") %}</div> <div class="cell text-right">{%= __("Discount") %}</div>
@ -52,7 +51,6 @@
</div> </div>
</div> </div>
</div> </div>
{% } %}
<div class="pos-list-row grand-total-area collapse-btn" style="border-bottom:1px solid #d1d8dd;"> <div class="pos-list-row grand-total-area collapse-btn" style="border-bottom:1px solid #d1d8dd;">
<div class="cell"> <div class="cell">
<a class=""> <a class="">