nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Minor] [Staging] POS Profile (#15321)

Browse Source 
* update modified date to load field display_items_in_stock

* stop dialog from popping up if no loyalty program found

* warehouse not used for not is_pos type invoice
This commit is contained in:
Zarrar
2018-09-05 17:20:07 +05:30
committed by Nabin Hait
parent 5122a8e0d7
commit 2705af488d
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@@ -1585,7 +1585,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-05-16 22:43:37.272875", "modified": "2018-09-05 12:43:37.272875",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -237,7 +237,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
"customer": this.frm.doc.customer "customer": this.frm.doc.customer
}, },
callback: function(r) { callback: function(r) {
if(r.message) { if(r.message.length) {
select_loyalty_program(me.frm, r.message); select_loyalty_program(me.frm, r.message);
} }
} }

1
erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
View File

@@ -37,7 +37,6 @@ def get_columns(filters):
_("Sales and Returns") + ":Currency/currency:120", _("Sales and Returns") + ":Currency/currency:120",
_("Taxes") + ":Currency/currency:120", _("Taxes") + ":Currency/currency:120",
_("Payments") + ":Currency/currency:120", _("Payments") + ":Currency/currency:120",
_("Warehouse") + ":Data:200"
] ]