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

Merge branch 'develop' into prod-plan-status

Browse Source
This commit is contained in:
Nabin Hait 2020-10-29 18:58:32 +05:30 committed by GitHub
commit b7285fdcad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
"column_break_9", "column_break_9",
"update_stock", "update_stock",
"ignore_pricing_rule", "ignore_pricing_rule",
"hide_unavailable_items",
"warehouse", "warehouse",
"campaign", "campaign",
"company_address", "company_address",
@ -307,13 +308,19 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Update Stock", "label": "Update Stock",
"read_only": 1 "read_only": 1
},
{
"default": "0",
"fieldname": "hide_unavailable_items",
"fieldtype": "Check",
"label": "Hide Unavailable Items"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2020-10-20 13:16:50.665081", "modified": "2020-10-29 13:18:38.795925",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",

2
erpnext/accounts/doctype/subscription/test_subscription.py
View File

@ -237,7 +237,7 @@ class TestSubscription(unittest.TestCase):
subscription.party_type = 'Customer' subscription.party_type = 'Customer'
subscription.party = '_Test Customer' subscription.party = '_Test Customer'
subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1}) subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
subscription.start_date = '2018-01-01' subscription.start_date = add_days(nowdate(), -1000)
subscription.insert() subscription.insert()
subscription.process() # generate first invoice subscription.process() # generate first invoice

10
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -742,10 +742,12 @@ def get_items_for_material_requests(doc, warehouses=None):
mr_items = new_mr_items mr_items = new_mr_items
if not mr_items: if not mr_items:
frappe.msgprint(_("""As raw materials projected quantity is more than required quantity, to_enable = frappe.bold(_("Ignore Existing Projected Quantity"))
there is no need to create material request for the warehouse {0}. warehouse = frappe.bold(doc.get('for_warehouse'))
Still if you want to make material request, message = _("As there are sufficient raw materials, Material Request is not required for Warehouse {0}.").format(warehouse) + "<br><br>"
kindly enable <b>Ignore Existing Projected Quantity</b> checkbox""").format(doc.get('for_warehouse'))) message += _(" If you still want to proceed, please enable {0}.").format(to_enable)
frappe.msgprint(message, title=_("Note"))
return mr_items return mr_items

15
erpnext/public/js/controllers/transaction.js
View File

@ -352,9 +352,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
let show_description = function(idx, exist = null) { let show_description = function(idx, exist = null) {
if (exist) { if (exist) {
scan_barcode_field.set_new_description(__('Row #{0}: Qty increased by 1', [idx])); frappe.show_alert({
message: __('Row #{0}: Qty increased by 1', [idx]),
indicator: 'green'
});
} else { } else {
scan_barcode_field.set_new_description(__('Row #{0}: Item added', [idx])); frappe.show_alert({
message: __('Row #{0}: Item added', [idx]),
indicator: 'green'
});
} }
} }
@ -365,7 +371,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}).then(r => { }).then(r => {
const data = r && r.message; const data = r && r.message;
if (!data || Object.keys(data).length === 0) { if (!data || Object.keys(data).length === 0) {
scan_barcode_field.set_new_description(__('Cannot find Item with this barcode')); frappe.show_alert({
message: __('Cannot find Item with this Barcode'),
indicator: 'red'
});
return; return;
} }

6
erpnext/selling/page/point_of_sale/point_of_sale.py
View File

@ -14,11 +14,11 @@ from six import string_types
def get_items(start, page_length, price_list, item_group, pos_profile, search_value=""): def get_items(start, page_length, price_list, item_group, pos_profile, search_value=""):
data = dict() data = dict()
result = [] result = []
warehouse, show_only_available_items = "", False warehouse, hide_unavailable_items = "", False
allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock') allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock')
if not allow_negative_stock: if not allow_negative_stock:
warehouse, show_only_available_items = frappe.db.get_value('POS Profile', pos_profile, ['warehouse', 'show_only_available_items']) warehouse, hide_unavailable_items = frappe.db.get_value('POS Profile', pos_profile, ['warehouse', 'hide_unavailable_items'])
if not frappe.db.exists('Item Group', item_group): if not frappe.db.exists('Item Group', item_group):
item_group = get_root_of('Item Group') item_group = get_root_of('Item Group')
@ -48,7 +48,7 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_va
lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt']) lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt'])
bin_join_selection, bin_join_condition = "", "" bin_join_selection, bin_join_condition = "", ""
if show_only_available_items: if hide_unavailable_items:
bin_join_selection = ", `tabBin` bin" bin_join_selection = ", `tabBin` bin"
bin_join_condition = "AND bin.warehouse = %(warehouse)s AND bin.item_code = item.name AND bin.actual_qty > 0" bin_join_condition = "AND bin.warehouse = %(warehouse)s AND bin.item_code = item.name AND bin.actual_qty > 0"