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

[design] Fixed Grid Reports

Browse Source
This commit is contained in:
Anand Doshi
2015-01-01 16:25:43 +05:30
parent 90e270a8aa
commit 3f5e95a99e
8 changed files with 68 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/page/stock_ledger/stock_ledger.js
View File

@@ -80,12 +80,9 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
{fieldtype:"Date", label: __("From Date"), filter: function(val, item) {
return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date);
}},
{fieldtype:"Label", label: __("To")},
{fieldtype:"Date", label: __("To Date"), filter: function(val, item) {
return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date);
}},
{fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"},
{fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"}
}}
],
setup_filters: function() {

80
erpnext/stock/page/stock_level/stock_level.js
View File

@@ -1,13 +1,13 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['stock-level'].onload = function(wrapper) {
frappe.pages['stock-level'].onload = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Stock Level'),
single_column: true
});
new erpnext.StockLevel(wrapper);
@@ -20,16 +20,16 @@ frappe.require("assets/erpnext/js/stock_grid_report.js");
erpnext.StockLevel = erpnext.StockGridReport.extend({
init: function(wrapper) {
var me = this;
this._super({
title: __("Stock Level"),
page: wrapper,
parent: $(wrapper).find('.layout-main'),
page: wrapper.page,
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order",
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order",
"Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand", "Serial No"],
});
this.wrapper.bind("make", function() {
frappe.utils.set_footnote(me, me.wrapper.get(0),
"<ul> \
@@ -46,10 +46,10 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
</ul>");
});
},
setup_columns: function() {
this.columns = [
{id: "item_code", name: __("Item Code"), field: "item_code", width: 160,
{id: "item_code", name: __("Item Code"), field: "item_code", width: 160,
link_formatter: {
filter_input: "item_code",
open_btn: true,
@@ -57,61 +57,59 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
}},
{id: "item_name", name: __("Item Name"), field: "item_name", width: 100,
formatter: this.text_formatter},
{id: "description", name: __("Description"), field: "description", width: 200,
{id: "description", name: __("Description"), field: "description", width: 200,
formatter: this.text_formatter},
{id: "brand", name: __("Brand"), field: "brand", width: 100,
link_formatter: {filter_input: "brand"}},
{id: "warehouse", name: __("Warehouse"), field: "warehouse", width: 100,
link_formatter: {filter_input: "warehouse"}},
{id: "uom", name: __("UOM"), field: "uom", width: 60},
{id: "actual_qty", name: __("Actual Qty"),
{id: "actual_qty", name: __("Actual Qty"),
field: "actual_qty", width: 80, formatter: this.currency_formatter},
{id: "planned_qty", name: __("Planned Qty"),
{id: "planned_qty", name: __("Planned Qty"),
field: "planned_qty", width: 80, formatter: this.currency_formatter},
{id: "requested_qty", name: __("Requested Qty"),
{id: "requested_qty", name: __("Requested Qty"),
field: "requested_qty", width: 80, formatter: this.currency_formatter},
{id: "ordered_qty", name: __("Ordered Qty"),
{id: "ordered_qty", name: __("Ordered Qty"),
field: "ordered_qty", width: 80, formatter: this.currency_formatter},
{id: "reserved_qty", name: __("Reserved Qty"),
{id: "reserved_qty", name: __("Reserved Qty"),
field: "reserved_qty", width: 80, formatter: this.currency_formatter},
{id: "projected_qty", name: __("Projected Qty"),
{id: "projected_qty", name: __("Projected Qty"),
field: "projected_qty", width: 80, formatter: this.currency_formatter},
{id: "re_order_level", name: __("Re-Order Level"),
{id: "re_order_level", name: __("Re-Order Level"),
field: "re_order_level", width: 80, formatter: this.currency_formatter},
{id: "re_order_qty", name: __("Re-Order Qty"),
{id: "re_order_qty", name: __("Re-Order Qty"),
field: "re_order_qty", width: 80, formatter: this.currency_formatter},
];
},
filters: [
{fieldtype:"Link", label: __("Item Code"), link:"Item", default_value: "Select Item...",
filter: function(val, item, opts) {
return item.item_code == val || !val;
}},
{fieldtype:"Select", label: __("Warehouse"), link:"Warehouse",
{fieldtype:"Select", label: __("Warehouse"), link:"Warehouse",
default_value: "Select Warehouse...", filter: function(val, item, opts) {
return item.warehouse == val || val == opts.default_value;
}},
{fieldtype:"Select", label: __("Brand"), link:"Brand",
{fieldtype:"Select", label: __("Brand"), link:"Brand",
default_value: "Select Brand...", filter: function(val, item, opts) {
return val == opts.default_value || item.brand == val;
}},
{fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"},
{fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"}
}}
],
setup_filters: function() {
var me = this;
this._super();
this.wrapper.bind("apply_filters_from_route", function() { me.toggle_enable_brand(); });
this.filter_inputs.item_code.change(function() { me.toggle_enable_brand(); });
this.trigger_refresh_on_change(["item_code", "warehouse", "brand"]);
},
toggle_enable_brand: function() {
if(!this.filter_inputs.item_code.val()) {
this.filter_inputs.brand.prop("disabled", false);
@@ -121,12 +119,12 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
.prop("disabled", true);
}
},
init_filter_values: function() {
this._super();
this.filter_inputs.warehouse.get(0).selectedIndex = 0;
},
prepare_data: function() {
var me = this;
@@ -136,7 +134,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
this.item_by_name = this.make_name_map(frappe.report_dump.data["Item"]);
this.calculate_quantities();
}
this.data = [].concat(this._data);
this.data = $.map(this.data, function(d) {
return me.apply_filters(d) ? d : null;
@@ -144,15 +142,15 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
this.calculate_total();
},
calculate_quantities: function() {
var me = this;
$.each([
["Stock Ledger Entry", "actual_qty"],
["Production Order", "planned_qty"],
["Stock Ledger Entry", "actual_qty"],
["Production Order", "planned_qty"],
["Material Request Item", "requested_qty"],
["Purchase Order Item", "ordered_qty"],
["Sales Order Item", "reserved_qty"]],
["Sales Order Item", "reserved_qty"]],
function(i, v) {
$.each(frappe.report_dump.data[v[0]], function(i, item) {
var row = me.get_row(item.item_code, item.warehouse);
@@ -160,7 +158,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
});
}
);
// sort by item, warehouse
this._data = $.map(Object.keys(this.item_warehouse_map).sort(), function(key) {
return me.item_warehouse_map[key];
@@ -192,15 +190,15 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
id: key,
}
this.reset_item_values(row);
row["re_order_level"] = item.re_order_level
row["re_order_qty"] = item.re_order_qty
this.item_warehouse_map[key] = row;
}
return this.item_warehouse_map[key];
},
calculate_total: function() {
var me = this;
// show total if a specific item is selected and warehouse is not filtered
@@ -212,7 +210,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
_show: true
};
this.reset_item_values(total);
$.each(this.data, function(i, row) {
$.each(me.columns, function(i, col) {
if (col.formatter==me.currency_formatter) {
@@ -220,7 +218,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
}
});
});
this.data = this.data.concat([total]);
}
}