-
-
- `);
-
- $item_card.find(".item-link").click((e) => {
- e.preventDefault();
- this.on_item_click && this.on_item_click(item.name);
- });
-
- return $item_card;
- }
-
- get_item_image(item, size=this.img_size) {
- const _size = size + 'px';
- const item_image = item.image ?
- `
- ${ this.get_item_image(item) }
-
-
-
- ${!item.seen ? item.item_name : `${item.item_name}`}
-
-
-
-
- ${!item.seen ? item.item_name : `${item.item_name}`}
-
-
${ item.formatted_price ? item.formatted_price : ''}
- ${item.item_name[0]}
`;
-
- return `
-
- ${item_image}
-
`;
- }
-}
diff --git a/erpnext/hub_node/page/hub/hub.json b/erpnext/hub_node/page/hub/hub.json
deleted file mode 100644
index 2d7c8997a2..0000000000
--- a/erpnext/hub_node/page/hub/hub.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "content": null,
- "creation": "2015-02-18 05:17:17.301735",
- "docstatus": 0,
- "doctype": "Page",
- "modified": "2015-02-18 05:17:17.301735",
- "modified_by": "Administrator",
- "module": "Hub Node",
- "name": "hub",
- "owner": "Administrator",
- "page_name": "hub",
- "roles": [
- {
- "role": "All"
- }
- ],
- "script": null,
- "standard": "Yes",
- "style": null,
- "title": "Hub"
-}
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 2c7a289ee6..e99bf59348 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -502,4 +502,6 @@ erpnext.patches.v10_0.taxes_issue_with_pos
erpnext.patches.v10_0.set_qty_in_transactions_based_on_serial_no_input
erpnext.patches.v10_0.show_leaves_of_all_department_members_in_calendar
erpnext.patches.v10_0.update_status_in_purchase_receipt
-erpnext.patches.v10_0.update_address_template_for_india
\ No newline at end of file
+erpnext.patches.v10_0.update_address_template_for_india
+erpnext.patches.v10_0.set_discount_amount
+erpnext.patches.v10_0.recalculate_gross_margin_for_project
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/recalculate_gross_margin_for_project.py b/erpnext/patches/v10_0/recalculate_gross_margin_for_project.py
new file mode 100644
index 0000000000..6d461f3bc9
--- /dev/null
+++ b/erpnext/patches/v10_0/recalculate_gross_margin_for_project.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc('projects', 'doctype', 'project')
+ for d in frappe.db.sql(""" select name from `tabProject` where
+ ifnull(total_consumed_material_cost, 0 ) > 0 and ifnull(total_billed_amount, 0) > 0""", as_dict=1):
+ doc = frappe.get_doc("Project", d.name)
+ doc.calculate_gross_margin()
+ doc.db_set('gross_margin', doc.gross_margin)
+ doc.db_set('per_gross_margin', doc.per_gross_margin)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_discount_amount.py b/erpnext/patches/v10_0/set_discount_amount.py
new file mode 100644
index 0000000000..019d245d45
--- /dev/null
+++ b/erpnext/patches/v10_0/set_discount_amount.py
@@ -0,0 +1,56 @@
+
+import frappe
+
+def execute():
+ frappe.reload_doc("accounts", "doctype", "sales_invoice_item")
+ frappe.reload_doc('accounts', 'doctype', 'purchase_invoice_item')
+ frappe.reload_doc('buying', 'doctype', 'purchase_order_item')
+ frappe.reload_doc('buying', 'doctype', 'supplier_quotation_item')
+ frappe.reload_doc('selling', 'doctype', 'sales_order_item')
+ frappe.reload_doc('selling', 'doctype', 'quotation_item')
+ frappe.reload_doc('stock', 'doctype', 'delivery_note_item')
+ frappe.reload_doc('stock', 'doctype', 'purchase_receipt_item')
+
+ selling_doctypes = ["Sales Order Item", "Sales Invoice Item", "Delivery Note Item", "Quotation Item"]
+ buying_doctypes = ["Purchase Order Item", "Purchase Invoice Item", "Purchase Receipt Item", "Supplier Quotation Item"]
+
+ for doctype in selling_doctypes:
+ values = frappe.db.sql('''
+ SELECT
+ discount_percentage, rate_with_margin, price_list_rate, name
+ FROM
+ `tab%s`
+ WHERE
+ ifnull(discount_percentage, 0) > 0
+ ''' % (doctype), as_dict=True)
+ calculate_discount(doctype, values)
+
+ for doctype in buying_doctypes:
+ values = frappe.db.sql('''
+ SELECT
+ discount_percentage, price_list_rate, name
+ FROM
+ `tab%s`
+ WHERE
+ discount_percentage > 0
+ ''' % (doctype), as_dict=True)
+ calculate_discount(doctype, values)
+
+def calculate_discount(doctype, values):
+ rate = None
+ if not values: return
+ for d in values:
+ if d.rate_with_margin and d.rate_with_margin > 0:
+ rate = d.rate_with_margin
+ else:
+ rate = d.price_list_rate
+
+ discount_value = rate * d.get('discount_percentage') / 100
+ frappe.db.sql('''
+ UPDATE
+ `tab%s`
+ SET
+ discount_amount = %s
+ WHERE
+ name = '%s'
+ ''' % (doctype, discount_value, d.get('name')))
diff --git a/erpnext/portal/doctype/products_settings/products_settings.json b/erpnext/portal/doctype/products_settings/products_settings.json
index 2d025cfe65..69abae13a4 100644
--- a/erpnext/portal/doctype/products_settings/products_settings.json
+++ b/erpnext/portal/doctype/products_settings/products_settings.json
@@ -14,6 +14,7 @@
"fields": [
{
"allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -41,10 +42,43 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -71,10 +105,75 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "show_availability_status",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Show Availability Status",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -103,6 +202,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
}
],
@@ -116,7 +216,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-11-07 19:34:33.055048",
+ "modified": "2018-08-14 17:59:58.473100",
"modified_by": "Administrator",
"module": "Portal",
"name": "Products Settings",
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 09726dac28..75582cde6f 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -69,6 +69,7 @@ class Project(Document):
self.tasks = []
self.load_tasks()
self.send_welcome_email()
+ self.update_percent_complete()
def validate_project_name(self):
if self.get("__islocal") and frappe.db.exists("Project", self.project_name):
@@ -236,9 +237,13 @@ class Project(Document):
self.update_purchase_costing()
self.update_sales_amount()
self.update_billed_amount()
+ self.calculate_gross_margin()
- self.gross_margin = flt(self.total_billed_amount) - (flt(self.total_costing_amount) + flt(self.total_expense_claim) + flt(self.total_purchase_cost))
+ def calculate_gross_margin(self):
+ expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim)
+ + flt(self.total_purchase_cost) + flt(self.get('total_consumed_material_cost', 0)))
+ self.gross_margin = flt(self.total_billed_amount) - expense_amount
if self.total_billed_amount:
self.per_gross_margin = (self.gross_margin / flt(self.total_billed_amount)) *100
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 0fd6c97f50..11655e9218 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -113,8 +113,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]);
- item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0),
- precision("rate", item));
+ item.discount_amount = flt(item.price_list_rate) * flt(item.discount_percentage) / 100;
+ item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
this.calculate_taxes_and_totals();
},
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index b6690cbcbe..a31acfc5f5 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -16,8 +16,8 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
item.rate = flt(item.rate_with_margin , precision("rate", item));
if(item.discount_percentage){
- var discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
- item.rate = flt((item.rate_with_margin) - (discount_value), precision('rate', item));
+ item.discount_amount = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
+ item.rate = flt((item.rate_with_margin) - (item.discount_amount), precision('rate', item));
}
},
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 4f5a295016..6b721c004e 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -790,6 +790,38 @@
"unique": 0,
"width": "100px"
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "discount_percentage",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Discount Amount",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -1766,7 +1798,7 @@
"istable": 1,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-12-14 09:39:17.180709",
+ "modified": "2018-08-06 05:18:38.135668",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index fe53e4d020..ec80475c02 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -820,6 +820,38 @@
"unique": 0,
"width": "70px"
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "discount_percentage",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Discount Amount",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2146,7 +2178,7 @@
"istable": 1,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-11-30 14:05:39.173834",
+ "modified": "2018-08-06 05:17:51.297862",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index aa5b3ba498..e062f4916f 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -145,6 +145,15 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.set_gross_profit(item);
},
+ discount_amount: function(doc, cdt, cdn) {
+ var item = frappe.get_doc(cdt, cdn);
+ if(!item.price_list_rate) {
+ item.discount_amount = 0.0;
+ } else {
+ this.price_list_rate(doc, cdt, cdn);
+ }
+ },
+
commission_rate: function() {
this.calculate_commission();
refresh_field("total_commission");
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 0ff7c2b3aa..5e06f636c9 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -138,6 +138,9 @@ def get_item_for_list_in_html(context):
if (context.get("website_image") or "").startswith("files/"):
context["website_image"] = "/" + urllib.quote(context["website_image"])
+ context["show_availability_status"] = cint(frappe.db.get_single_value('Products Settings',
+ 'show_availability_status'))
+
products_template = 'templates/includes/products_as_grid.html'
if cint(frappe.db.get_single_value('Products Settings', 'products_as_list')):
products_template = 'templates/includes/products_as_list.html'
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 5487193284..88b6cfdedb 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -819,6 +819,38 @@
"unique": 0,
"width": "100px"
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "discount_percentage",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Discount Amount",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2139,7 +2171,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-11-30 14:07:12.217563",
+ "modified": "2018-08-06 05:18:26.132899",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 1b4cfd9e49..6520497c6a 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -759,6 +759,38 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "discount_percentage",
+ "fieldname": "discount_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Discount Amount",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2290,7 +2322,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-12-06 13:50:08.201145",
+ "modified": "2018-08-06 05:16:48.590787",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 5ed8ada499..4905446c91 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -82,6 +82,7 @@ class StockEntry(StockController):
if self.purchase_order and self.purpose == "Subcontract":
self.update_purchase_order_supplied_items()
self.make_gl_entries_on_cancel()
+ self.update_cost_in_project()
def validate_purpose(self):
valid_purposes = ["Material Issue", "Material Receipt", "Material Transfer", "Material Transfer for Manufacture",
@@ -107,8 +108,8 @@ class StockEntry(StockController):
se.docstatus = 1 and se.project = %s and sed.parent = se.name
and (sed.t_warehouse is null or sed.t_warehouse = '')""", self.project, as_list=1)
- if amount:
- frappe.db.set_value('Project', self.project, 'total_consumed_material_cost', amount[0][0])
+ amount = amount[0][0] if amount else 0
+ frappe.db.set_value('Project', self.project, 'total_consumed_material_cost', amount)
def validate_item(self):
stock_items = self.get_stock_items()
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 0eee6baddd..ea476e6d32 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -139,7 +139,7 @@ class Warehouse(NestedSet):
@frappe.whitelist()
def get_children(doctype, parent=None, company=None, is_root=False):
- from erpnext.stock.utils import get_stock_value_on
+ from erpnext.stock.utils import get_stock_value_from_bin
if is_root:
parent = ""
@@ -154,7 +154,7 @@ def get_children(doctype, parent=None, company=None, is_root=False):
# return warehouses
for wh in warehouses:
- wh["balance"] = get_stock_value_on(warehouse=wh.value)
+ wh["balance"] = get_stock_value_from_bin(warehouse=wh.value)
return warehouses
@frappe.whitelist()
@@ -170,4 +170,4 @@ def add_node():
@frappe.whitelist()
def convert_to_group_or_ledger():
args = frappe.form_dict
- return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
\ No newline at end of file
+ return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index eaa3d4d956..cbc0828a1c 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -481,8 +481,8 @@ def get_projected_qty(item_code, warehouse):
@frappe.whitelist()
def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
- ["projected_qty", "actual_qty"], as_dict=True) \
- or {"projected_qty": 0, "actual_qty": 0}
+ ["projected_qty", "actual_qty", "reserved_qty"], as_dict=True) \
+ or {"projected_qty": 0, "actual_qty": 0, "reserved_qty": 0}
@frappe.whitelist()
def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 9b2fcb7088..6140c17dd8 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -9,21 +9,45 @@ from frappe.utils import flt, cstr, nowdate, nowtime
class InvalidWarehouseCompany(frappe.ValidationError): pass
+def get_stock_value_from_bin(warehouse=None, item_code=None):
+ values = {}
+ conditions = ""
+ if warehouse:
+ conditions += """ and warehouse in (
+ select w2.name from `tabWarehouse` w1
+ join `tabWarehouse` w2 on
+ w1.name = %(warehouse)s
+ and w2.lft between w1.lft and w1.rgt
+ ) """
+
+ values['warehouse'] = warehouse
+
+ if item_code:
+ conditions += " and item_code = %(item_code)s"
+
+ values['item_code'] = item_code
+
+ query = "select sum(stock_value) from `tabBin` where 1 = 1 %s" % conditions
+
+ stock_value = frappe.db.sql(query, values)
+
+ return stock_value
+
def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
if not posting_date: posting_date = nowdate()
values, condition = [posting_date], ""
if warehouse:
-
+
lft, rgt, is_group = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt", "is_group"])
-
+
if is_group:
values.extend([lft, rgt])
condition += "and exists (\
select name from `tabWarehouse` wh where wh.name = sle.warehouse\
and wh.lft >= %s and wh.rgt <= %s)"
-
+
else:
values.append(warehouse)
condition += " AND warehouse = %s"
@@ -43,7 +67,7 @@ def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
for sle in stock_ledger_entries:
if not sle_map.has_key((sle.item_code, sle.warehouse)):
sle_map[(sle.item_code, sle.warehouse)] = flt(sle.stock_value)
-
+
return sum(sle_map.values())
@frappe.whitelist()
@@ -73,17 +97,17 @@ def get_latest_stock_qty(item_code, warehouse=None):
values, condition = [item_code], ""
if warehouse:
lft, rgt, is_group = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt", "is_group"])
-
+
if is_group:
values.extend([lft, rgt])
condition += "and exists (\
select name from `tabWarehouse` wh where wh.name = tabBin.warehouse\
and wh.lft >= %s and wh.rgt <= %s)"
-
+
else:
values.append(warehouse)
condition += " AND warehouse = %s"
-
+
actual_qty = frappe.db.sql("""select sum(actual_qty) from tabBin
where item_code=%s {0}""".format(condition), values)[0][0]
@@ -219,4 +243,3 @@ def validate_warehouse_company(warehouse, company):
def is_group_warehouse(warehouse):
if frappe.db.get_value("Warehouse", warehouse, "is_group"):
frappe.throw(_("Group node warehouse is not allowed to select for transactions"))
-
diff --git a/erpnext/templates/includes/products_as_grid.html b/erpnext/templates/includes/products_as_grid.html
index 4a9692aff6..13269ec259 100644
--- a/erpnext/templates/includes/products_as_grid.html
+++ b/erpnext/templates/includes/products_as_grid.html
@@ -5,10 +5,12 @@
{{ product_image_square(thumbnail or website_image) }}
{{ item_name }}
- {% if in_stock or not is_stock_item %}
- {{ _("In stock") }}
- {% else %}
- {{ _("Not in stock") }}
+ {% if show_availability_status %}
+ {% if in_stock or not is_stock_item %}
+ {{ _("In stock") }}
+ {% else %}
+ {{ _("Not in stock") }}
+ {% endif %}
{% endif %}