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

Made POS Profile mandatory and changed test order

Browse Source
This commit is contained in:
Nabin Hait
2017-11-08 14:34:38 +05:30
parent eb760d6d09
commit ff73646212
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@ def get_pos_data():
doc = frappe.new_doc('Sales Invoice') doc = frappe.new_doc('Sales Invoice')
doc.is_pos = 1; doc.is_pos = 1;
pos_profile = get_pos_profile(doc.company) or {} pos_profile = get_pos_profile(doc.company) or {}
if not pos_profile:
frappe.throw(_("POS Profile is required to use Point-of-Sale"))
if not doc.company: doc.company = pos_profile.get('company') if not doc.company: doc.company = pos_profile.get('company')
doc.update_stock = pos_profile.get('update_stock') doc.update_stock = pos_profile.get('update_stock')

3
erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py
View File

@@ -6,7 +6,8 @@ import frappe
def execute(): def execute():
doctype = 'POS Profile' doctype = 'POS Profile'
frappe.reload_doctype(doctype) frappe.reload_doc('accounts', 'doctype', doctype)
frappe.reload_doc('accounts', 'doctype', 'POS Profile User')
for doc in frappe.get_all(doctype): for doc in frappe.get_all(doctype):
_doc = frappe.get_doc(doctype, doc.name) _doc = frappe.get_doc(doctype, doc.name)

3
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@@ -326,6 +326,9 @@ erpnext.pos.PointOfSale = class PointOfSale {
__('Select POS Profile') __('Select POS Profile')
); );
} }
} else {
frappe.dom.unfreeze();
frappe.throw(__("POS Profile is required to use Point-of-Sale"));
} }
}); });
}); });

2
erpnext/tests/ui/tests.txt
View File

@@ -50,8 +50,8 @@ erpnext/schools/doctype/room/test_room.js
erpnext/schools/doctype/instructor/test_instructor.js erpnext/schools/doctype/instructor/test_instructor.js
erpnext/stock/doctype/warehouse/test_warehouse.js erpnext/stock/doctype/warehouse/test_warehouse.js
erpnext/manufacturing/doctype/production_order/test_production_order.js #long erpnext/manufacturing/doctype/production_order/test_production_order.js #long
erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
erpnext/accounts/page/pos/test_pos.js erpnext/accounts/page/pos/test_pos.js
erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
erpnext/selling/doctype/product_bundle/test_product_bundle.js erpnext/selling/doctype/product_bundle/test_product_bundle.js
erpnext/stock/doctype/delivery_note/test_delivery_note.js erpnext/stock/doctype/delivery_note/test_delivery_note.js
erpnext/stock/doctype/material_request/tests/test_material_request.js erpnext/stock/doctype/material_request/tests/test_material_request.js