Removed old page style Stock ledger end stock level report
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4c6295e..d857c59 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -149,3 +149,5 @@
erpnext.patches.v5_0.update_advance_paid
erpnext.patches.v5_0.link_warehouse_with_account
erpnext.patches.v5_0.rename_taxes_and_charges_master
+execute:frappe.delete_doc("Page", "stock-ledger")
+execute:frappe.delete_doc("Page", "stock-level")
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_ledger/README.md b/erpnext/stock/page/stock_ledger/README.md
deleted file mode 100644
index 774498b..0000000
--- a/erpnext/stock/page/stock_ledger/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Stock movement report based on Stock Ledger Entry.
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_ledger/__init__.py b/erpnext/stock/page/stock_ledger/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/stock/page/stock_ledger/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js
deleted file mode 100644
index befd889..0000000
--- a/erpnext/stock/page/stock_ledger/stock_ledger.js
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.pages['stock-ledger'].on_page_load = function(wrapper) {
- frappe.ui.make_app_page({
- parent: wrapper,
- title: __('Stock Ledger'),
- single_column: true
- });
-
- new erpnext.StockLedger(wrapper);
- frappe.breadcrumbs.add("Stock")
-};
-
-frappe.require("assets/erpnext/js/stock_grid_report.js");
-
-erpnext.StockLedger = erpnext.StockGridReport.extend({
- init: function(wrapper) {
- this._super({
- title: __("Stock Ledger"),
- page: wrapper,
- parent: $(wrapper).find('.layout-main'),
- page: wrapper.page,
- doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Serial No"],
- })
- },
-
- setup_columns: function() {
- this.hide_balance = (this.is_default("item_code") || this.voucher_no) ? true : false;
- this.columns = [
- {id: "posting_datetime", name: __("Posting Date"), field: "posting_datetime", width: 120,
- formatter: this.date_formatter},
- {id: "item_code", name: __("Item Code"), field: "item_code", width: 160,
- link_formatter: {
- filter_input: "item_code",
- open_btn: true,
- doctype: '"Item"',
- }},
- {id: "description", name: __("Description"), field: "description", width: 200,
- formatter: this.text_formatter},
- {id: "warehouse", name: __("Warehouse"), field: "warehouse", width: 100,
- link_formatter: {filter_input: "warehouse"}},
- {id: "brand", name: __("Brand"), field: "brand", width: 100},
- {id: "stock_uom", name: __("UOM"), field: "stock_uom", width: 100},
- {id: "qty", name: __("Qty"), field: "qty", width: 100,
- formatter: this.currency_formatter},
- {id: "balance", name: __("Balance Qty"), field: "balance", width: 100,
- formatter: this.currency_formatter,
- hidden: this.hide_balance},
- {id: "balance_value", name: __("Balance Value"), field: "balance_value", width: 100,
- formatter: this.currency_formatter, hidden: this.hide_balance},
- {id: "voucher_type", name: __("Voucher Type"), field: "voucher_type", width: 120},
- {id: "voucher_no", name: __("Voucher No"), field: "voucher_no", width: 160,
- link_formatter: {
- filter_input: "voucher_no",
- open_btn: true,
- doctype: "dataContext.voucher_type"
- }},
- ];
-
- },
- filters: [
- {fieldtype:"Select", label: __("Warehouse"), link:"Warehouse",
- default_value: "Select Warehouse...", filter: function(val, item, opts) {
- return item.warehouse == val || val == opts.default_value;
- }},
- {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: "Brand", link:"Brand",
- default_value: "Select Brand...", filter: function(val, item, opts) {
- return val == opts.default_value || item.brand == val || item._show;
- }, link_formatter: {filter_input: "brand"}},
- {fieldtype:"Data", label: __("Voucher No"),
- filter: function(val, item, opts) {
- if(!val) return true;
- return (item.voucher_no && item.voucher_no.indexOf(val)!=-1);
- }},
- {fieldtype:"Date", label: __("From Date"), filter: function(val, item) {
- return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date);
- }},
- {fieldtype:"Date", label: __("To Date"), filter: function(val, item) {
- return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date);
- }}
- ],
-
- 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);
- } else {
- this.filter_inputs.brand
- .val(this.filter_inputs.brand.get(0).opts.default_value)
- .prop("disabled", true);
- }
- },
-
- init_filter_values: function() {
- this._super();
- this.filter_inputs.warehouse.get(0).selectedIndex = 0;
- },
- prepare_data: function() {
- var me = this;
- if(!this.item_by_name)
- this.item_by_name = this.make_name_map(frappe.report_dump.data["Item"]);
- var data = frappe.report_dump.data["Stock Ledger Entry"];
- var out = [];
-
- var opening = {
- item_code: "On " + dateutil.str_to_user(this.from_date), qty: 0.0, balance: 0.0,
- id:"_opening", _show: true, _style: "font-weight: bold", balance_value: 0.0
- }
- var total_in = {
- item_code: "Total In", qty: 0.0, balance: 0.0, balance_value: 0.0,
- id:"_total_in", _show: true, _style: "font-weight: bold"
- }
- var total_out = {
- item_code: "Total Out", qty: 0.0, balance: 0.0, balance_value: 0.0,
- id:"_total_out", _show: true, _style: "font-weight: bold"
- }
-
- // clear balance
- $.each(frappe.report_dump.data["Item"], function(i, item) {
- item.balance = item.balance_value = 0.0;
- });
-
- // initialize warehouse-item map
- this.item_warehouse = {};
- this.serialized_buying_rates = this.get_serialized_buying_rates();
- var from_datetime = dateutil.str_to_obj(me.from_date + " 00:00:00");
- var to_datetime = dateutil.str_to_obj(me.to_date + " 23:59:59");
-
- //
- for(var i=0, j=data.length; i<j; i++) {
- var sl = data[i];
- var item = me.item_by_name[sl.item_code]
- var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);
- sl.description = item.description;
- sl.posting_datetime = sl.posting_date + " " + (sl.posting_time || "00:00:00");
- sl.brand = item.brand;
- var posting_datetime = dateutil.str_to_obj(sl.posting_datetime);
-
- var is_fifo = item.valuation_method ? item.valuation_method=="FIFO"
- : sys_defaults.valuation_method=="FIFO";
- var value_diff = me.get_value_diff(wh, sl, is_fifo);
-
- // opening, transactions, closing, total in, total out
- var before_end = posting_datetime <= to_datetime;
- if((!me.is_default("item_code") ? me.apply_filter(sl, "item_code") : true)
- && me.apply_filter(sl, "warehouse") && me.apply_filter(sl, "voucher_no")
- && me.apply_filter(sl, "brand")) {
- if(posting_datetime < from_datetime) {
- opening.balance += sl.qty;
- opening.balance_value += value_diff;
- } else if(before_end) {
- if(sl.qty > 0) {
- total_in.qty += sl.qty;
- total_in.balance_value += value_diff;
- } else {
- total_out.qty += (-1 * sl.qty);
- total_out.balance_value += value_diff;
- }
- }
- }
-
- if(!before_end) break;
-
- // apply filters
- if(me.apply_filters(sl)) {
- out.push(sl);
- }
-
- // update balance
- if((!me.is_default("warehouse") ? me.apply_filter(sl, "warehouse") : true)) {
- sl.balance = me.item_by_name[sl.item_code].balance + sl.qty;
- me.item_by_name[sl.item_code].balance = sl.balance;
-
- sl.balance_value = me.item_by_name[sl.item_code].balance_value + value_diff;
- me.item_by_name[sl.item_code].balance_value = sl.balance_value;
- }
- }
-
- if(me.item_code && !me.voucher_no) {
- var closing = {
- item_code: "On " + dateutil.str_to_user(this.to_date),
- balance: (out.length ? out[out.length-1].balance : 0), qty: 0,
- balance_value: (out.length ? out[out.length-1].balance_value : 0),
- id:"_closing", _show: true, _style: "font-weight: bold"
- };
- total_out.balance_value = -total_out.balance_value;
- var out = [opening].concat(out).concat([total_in, total_out, closing]);
- }
-
- this.data = out;
- },
- get_plot_data: function() {
- var data = [];
- var me = this;
- if(me.hide_balance) return false;
- data.push({
- label: me.item_code,
- data: [[dateutil.str_to_obj(me.from_date).getTime(), me.data[0].balance]]
- .concat($.map(me.data, function(col, idx) {
- if (col.posting_datetime) {
- return [[dateutil.str_to_obj(col.posting_datetime).getTime(), col.balance - col.qty],
- [dateutil.str_to_obj(col.posting_datetime).getTime(), col.balance]]
- }
- return null;
- })).concat([
- // closing
- [dateutil.str_to_obj(me.to_date).getTime(), me.data[me.data.length - 1].balance]
- ]),
- points: {show: true},
- lines: {show: true, fill: true},
- });
- return data;
- },
- get_plot_options: function() {
- return {
- grid: { hoverable: true, clickable: true },
- xaxis: { mode: "time",
- min: dateutil.str_to_obj(this.from_date).getTime(),
- max: dateutil.str_to_obj(this.to_date).getTime(),
- },
- series: { downsample: { threshold: 1000 } }
- }
- },
- get_tooltip_text: function(label, x, y) {
- var d = new Date(x);
- var date = dateutil.obj_to_user(d) + " " + d.getHours() + ":" + d.getMinutes();
- var value = format_number(y);
- return value.bold() + " on " + date;
- }
-});
diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.json b/erpnext/stock/page/stock_ledger/stock_ledger.json
deleted file mode 100644
index e2bd8f7..0000000
--- a/erpnext/stock/page/stock_ledger/stock_ledger.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "creation": "2012-09-21 20:15:14.000000",
- "docstatus": 0,
- "doctype": "Page",
- "icon": "icon-table",
- "idx": 1,
- "modified": "2013-07-11 14:44:19.000000",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "stock-ledger",
- "owner": "Administrator",
- "page_name": "stock-ledger",
- "roles": [
- {
- "role": "Analytics"
- },
- {
- "role": "Material Manager"
- },
- {
- "role": "Material User"
- }
- ],
- "standard": "Yes",
- "title": "Stock Ledger"
-}
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_level/README.md b/erpnext/stock/page/stock_level/README.md
deleted file mode 100644
index 43b2b0f..0000000
--- a/erpnext/stock/page/stock_level/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Stock levels (actual, planned, reserved, ordered) for Items on a particular date.
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_level/__init__.py b/erpnext/stock/page/stock_level/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/stock/page/stock_level/__init__.py
+++ /dev/null
diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js
deleted file mode 100644
index 92ec6c4..0000000
--- a/erpnext/stock/page/stock_level/stock_level.js
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.pages['stock-level'].on_page_load = function(wrapper) {
- frappe.ui.make_app_page({
- parent: wrapper,
- title: __('Stock Level'),
- single_column: true
- });
-
- new erpnext.StockLevel(wrapper);
-
-
- frappe.breadcrumbs.add("Stock")
- ;
-}
-
-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",
- "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> \
- <li style='font-weight: bold;'> \
- Projected Qty = Actual Qty + Planned Qty + Requested Qty \
- + Ordered Qty - Reserved Qty </li> \
- <ul> \
- <li>"+__("Actual Qty: Quantity available in the warehouse.") +"</li>"+
- "<li>"+__("Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.")+ "</li> " +
- "<li>"+__("Requested Qty: Quantity requested for purchase, but not ordered.") + "</li>" +
- "<li>" + __("Ordered Qty: Quantity ordered for purchase, but not received.")+ "</li>" +
- "<li>" + __("Reserved Qty: Quantity ordered for sale, but not delivered.") + "</li>" +
- "</ul> \
- </ul>");
- });
- },
-
- setup_columns: function() {
- this.columns = [
- {id: "item_code", name: __("Item Code"), field: "item_code", width: 160,
- link_formatter: {
- filter_input: "item_code",
- open_btn: true,
- doctype: '"Item"',
- }},
- {id: "item_name", name: __("Item Name"), field: "item_name", width: 100,
- formatter: this.text_formatter},
- {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"),
- field: "actual_qty", width: 80, formatter: this.currency_formatter},
- {id: "planned_qty", name: __("Planned Qty"),
- field: "planned_qty", width: 80, formatter: this.currency_formatter},
- {id: "requested_qty", name: __("Requested Qty"),
- field: "requested_qty", width: 80, formatter: this.currency_formatter},
- {id: "ordered_qty", name: __("Ordered Qty"),
- field: "ordered_qty", width: 80, formatter: this.currency_formatter},
- {id: "reserved_qty", name: __("Reserved Qty"),
- field: "reserved_qty", width: 80, formatter: this.currency_formatter},
- {id: "projected_qty", name: __("Projected Qty"),
- field: "projected_qty", width: 80, formatter: this.currency_formatter},
- {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"),
- 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",
- default_value: "Select Warehouse...", filter: function(val, item, opts) {
- return item.warehouse == val || val == opts.default_value;
- }},
-
- {fieldtype:"Select", label: __("Brand"), link:"Brand",
- default_value: "Select Brand...", filter: function(val, item, opts) {
- return val == opts.default_value || item.brand == val;
- }}
- ],
-
- 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);
- } else {
- this.filter_inputs.brand
- .val(this.filter_inputs.brand.get(0).opts.default_value)
- .prop("disabled", true);
- }
- },
-
- init_filter_values: function() {
- this._super();
- this.filter_inputs.warehouse.get(0).selectedIndex = 0;
- },
-
- prepare_data: function() {
- var me = this;
-
- if(!this._data) {
- this._data = [];
- this.item_warehouse_map = {};
- 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;
- });
-
- this.calculate_total();
- },
-
- calculate_quantities: function() {
- var me = this;
- $.each([
- ["Stock Ledger Entry", "actual_qty"],
- ["Production Order", "planned_qty"],
- ["Material Request Item", "requested_qty"],
- ["Purchase Order Item", "ordered_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);
- row[v[1]] += flt(item.qty);
- });
- }
- );
-
- // sort by item, warehouse
- this._data = $.map(Object.keys(this.item_warehouse_map).sort(), function(key) {
- return me.item_warehouse_map[key];
- });
-
- // calculate projected qty
- $.each(this._data, function(i, row) {
- row.projected_qty = row.actual_qty + row.planned_qty + row.requested_qty
- + row.ordered_qty - row.reserved_qty;
- });
-
- // filter out rows with zero values
- this._data = $.map(this._data, function(d) {
- return me.apply_zero_filter(null, d, null, me) ? d : null;
- });
- },
-
- get_row: function(item_code, warehouse) {
- var key = item_code + ":" + warehouse;
- if(!this.item_warehouse_map[key]) {
- var item = this.item_by_name[item_code];
- var row = {
- item_code: item_code,
- warehouse: warehouse,
- description: item.description,
- brand: item.brand,
- item_name: item.item_name || item.name,
- uom: item.stock_uom,
- 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
- if(this.is_default("warehouse") && !this.is_default("item_code")) {
- var total = {
- id: "_total",
- item_code: "Total",
- _style: "font-weight: bold",
- _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) {
- total[col.id] += row[col.id];
- }
- });
- });
-
- this.data = this.data.concat([total]);
- }
- }
-})
diff --git a/erpnext/stock/page/stock_level/stock_level.json b/erpnext/stock/page/stock_level/stock_level.json
deleted file mode 100644
index c6f3f96..0000000
--- a/erpnext/stock/page/stock_level/stock_level.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "creation": "2012-12-31 10:52:14.000000",
- "docstatus": 0,
- "doctype": "Page",
- "icon": "icon-table",
- "idx": 1,
- "modified": "2013-07-11 14:44:21.000000",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "stock-level",
- "owner": "Administrator",
- "page_name": "stock-level",
- "roles": [
- {
- "role": "Material Manager"
- },
- {
- "role": "Analytics"
- }
- ],
- "standard": "Yes",
- "title": "Stock Level"
-}
\ No newline at end of file