[Fix] Pos bugs (#16256)
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index f3ec775..6072fb8 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -324,7 +324,8 @@
return {
"print_format": print_format,
"allow_edit_rate": pos.get("allow_user_to_edit_rate"),
- "allow_edit_discount": pos.get("allow_user_to_edit_discount")
+ "allow_edit_discount": pos.get("allow_user_to_edit_discount"),
+ "campaign": pos.get("campaign")
}
def update_time_sheet(self, sales_invoice):
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 68cc500..f9364e2 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
@@ -762,6 +762,20 @@
set_perpetual_inventory(0)
frappe.db.sql("delete from `tabPOS Profile`")
+
+ def test_pos_si_without_payment(self):
+ set_perpetual_inventory()
+ make_pos_profile()
+
+ pos = copy.deepcopy(test_records[1])
+ pos["is_pos"] = 1
+ pos["update_stock"] = 1
+
+ si = frappe.copy_doc(pos)
+ si.insert()
+
+ # Check that the invoice cannot be submitted without payments
+ self.assertRaises(frappe.ValidationError, si.submit)
def test_sales_invoice_gl_entry_with_perpetual_inventory_no_item_code(self):
set_perpetual_inventory()
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 91f3711..04c8718 100755
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1135,16 +1135,18 @@
},
apply_category: function() {
- var me = this;
- category = this.selected_item_group || "All Item Groups";
+ frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name", (r) => {
+ category = this.selected_item_group || r.name;
- if(category == 'All Item Groups') {
- return this.item_data
- } else {
- return this.item_data.filter(function(element, index, array){
- return element.item_group == category;
- });
- }
+ if(category == r.name) {
+ return this.item_data
+ } else {
+ return this.item_data.filter(function(element, index, array){
+ return element.item_group == category;
+ });
+ }
+ })
+
},
bind_items_event: function() {
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index a6f7a28..1ee5971 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -394,7 +394,7 @@
}
}
- frappe.prompt(this.get_promopt_fields(),
+ frappe.prompt(this.get_prompt_fields(),
on_submit,
__('Select POS Profile')
);
@@ -417,11 +417,12 @@
]);
}
- get_promopt_fields() {
+ get_prompt_fields() {
return [{
fieldtype: 'Link',
label: __('POS Profile'),
options: 'POS Profile',
+ fieldname: 'pos_profile',
reqd: 1,
get_query: () => {
return {
@@ -433,7 +434,8 @@
}
}, {
fieldtype: 'Check',
- label: __('Set as default')
+ label: __('Set as default'),
+ fieldname: 'set_as_default'
}];
}
@@ -522,6 +524,7 @@
this.frm.meta.default_print_format = r.message.print_format || "";
this.frm.allow_edit_rate = r.message.allow_edit_rate;
this.frm.allow_edit_discount = r.message.allow_edit_discount;
+ this.frm.doc.campaign = r.message.campaign;
}
}
@@ -1128,12 +1131,15 @@
this.events = events;
this.currency = this.frm.doc.currency;
- this.make_dom();
- this.make_fields();
+ frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name", (r) => {
+ this.parent_item_group = r.name;
+ this.make_dom();
+ this.make_fields();
- this.init_clusterize();
- this.bind_events();
- this.load_items_data();
+ this.init_clusterize();
+ this.bind_events();
+ this.load_items_data();
+ })
}
load_items_data() {
@@ -1175,6 +1181,7 @@
make_fields() {
// Search field
+ const me = this;
this.search_field = frappe.ui.form.make_control({
df: {
fieldtype: 'Data',
@@ -1202,7 +1209,7 @@
fieldtype: 'Link',
label: 'Item Group',
options: 'Item Group',
- default: 'All Item Groups',
+ default: me.parent_item_group,
onchange: () => {
const item_group = this.item_group_field.get_value();
if (item_group) {
@@ -1258,7 +1265,7 @@
this.clusterize.update(row_items);
}
- filter_items({ search_term='', item_group='All Item Groups' }={}) {
+ filter_items({ search_term='', item_group=this.parent_item_group }={}) {
if (search_term) {
search_term = search_term.toLowerCase();
@@ -1271,7 +1278,7 @@
this.set_item_in_the_cart(items);
return;
}
- } else if (item_group == "All Item Groups") {
+ } else if (item_group == this.parent_item_group) {
this.items = this.all_items;
return this.render_items(this.all_items);
}
@@ -1376,7 +1383,7 @@
return template;
}
- get_items({start = 0, page_length = 40, search_value='', item_group="All Item Groups"}={}) {
+ get_items({start = 0, page_length = 40, search_value='', item_group=this.parent_item_group}={}) {
return new Promise(res => {
frappe.call({
method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",