Anand Doshi
commit
cf6e13d2fe
@ -157,7 +157,8 @@ wn.module_page["Accounts"] = [
|
|||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
"label":wn._("General Ledger"),
|
"label":wn._("General Ledger"),
|
||||||
page: "general-ledger"
|
doctype: "GL Entry",
|
||||||
|
route: "query-report/General Ledger"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label":wn._("Trial Balance"),
|
"label":wn._("Trial Balance"),
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
General Ledger report (for all transactions and accounts).
|
|
||||||
@ -1 +0,0 @@
|
|||||||
from __future__ import unicode_literals
|
|
||||||
@ -1,396 +0,0 @@
|
|||||||
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
|
||||||
// License: GNU General Public License v3. See license.txt
|
|
||||||
|
|
||||||
wn.pages['general-ledger'].onload = function(wrapper) {
|
|
||||||
wn.ui.make_app_page({
|
|
||||||
parent: wrapper,
|
|
||||||
title: wn._('General Ledger'),
|
|
||||||
single_column: true
|
|
||||||
});
|
|
||||||
|
|
||||||
erpnext.general_ledger = new erpnext.GeneralLedger(wrapper);
|
|
||||||
wrapper.appframe.add_module_icon("Accounts")
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
erpnext.GeneralLedger = wn.views.GridReport.extend({
|
|
||||||
init: function(wrapper) {
|
|
||||||
this._super({
|
|
||||||
title: wn._("General Ledger"),
|
|
||||||
page: wrapper,
|
|
||||||
parent: $(wrapper).find('.layout-main'),
|
|
||||||
appframe: wrapper.appframe,
|
|
||||||
doctypes: ["Company", "Account", "GL Entry", "Cost Center"],
|
|
||||||
});
|
|
||||||
},
|
|
||||||
setup_columns: function() {
|
|
||||||
this.columns = [
|
|
||||||
{id: "posting_date", name: wn._("Posting Date"), field: "posting_date", width: 100,
|
|
||||||
formatter: this.date_formatter},
|
|
||||||
{id: "account", name: wn._("Account"), field: "account", width: 240,
|
|
||||||
link_formatter: {
|
|
||||||
filter_input: "account",
|
|
||||||
open_btn: true,
|
|
||||||
doctype: "'Account'"
|
|
||||||
}},
|
|
||||||
{id: "against_account", name: wn._("Against Account"), field: "against_account",
|
|
||||||
width: 240, hidden: !this.account},
|
|
||||||
|
|
||||||
{id: "debit", name: wn._("Debit"), field: "debit", width: 100,
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "credit", name: wn._("Credit"), field: "credit", width: 100,
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "voucher_type", name: wn._("Voucher Type"), field: "voucher_type", width: 120},
|
|
||||||
{id: "voucher_no", name: wn._("Voucher No"), field: "voucher_no", width: 160,
|
|
||||||
link_formatter: {
|
|
||||||
filter_input: "voucher_no",
|
|
||||||
open_btn: true,
|
|
||||||
doctype: "dataContext.voucher_type"
|
|
||||||
}},
|
|
||||||
{id: "remarks", name: wn._("Remarks"), field: "remarks", width: 200,
|
|
||||||
formatter: this.text_formatter},
|
|
||||||
|
|
||||||
];
|
|
||||||
},
|
|
||||||
|
|
||||||
filters: [
|
|
||||||
{fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: wn._("Select Company..."),
|
|
||||||
filter: function(val, item, opts) {
|
|
||||||
return item.company == val || val == opts.default_value;
|
|
||||||
}},
|
|
||||||
{fieldtype:"Link", label: wn._("Account"), link:"Account",
|
|
||||||
filter: function(val, item, opts, me) {
|
|
||||||
if(!val) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
// true if GL Entry belongs to selected
|
|
||||||
// account ledger or group
|
|
||||||
return me.is_child_account(val, item.account);
|
|
||||||
}
|
|
||||||
}},
|
|
||||||
{fieldtype:"Data", label: wn._("Voucher No"),
|
|
||||||
filter: function(val, item, opts) {
|
|
||||||
if(!val) return true;
|
|
||||||
return (item.voucher_no && item.voucher_no.indexOf(val)!=-1);
|
|
||||||
}},
|
|
||||||
{fieldtype:"Date", label: wn._("From Date"), filter: function(val, item) {
|
|
||||||
return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date);
|
|
||||||
}},
|
|
||||||
{fieldtype:"Label", label: wn._("To")},
|
|
||||||
{fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) {
|
|
||||||
return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date);
|
|
||||||
}},
|
|
||||||
{fieldtype: "Check", label: wn._("Group by Ledger")},
|
|
||||||
{fieldtype: "Check", label: wn._("Group by Voucher")},
|
|
||||||
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
|
|
||||||
{fieldtype:"Button", label: wn._("Reset Filters")}
|
|
||||||
],
|
|
||||||
setup_filters: function() {
|
|
||||||
this._super();
|
|
||||||
var me = this;
|
|
||||||
|
|
||||||
this.accounts_by_company = this.make_accounts_by_company();
|
|
||||||
|
|
||||||
// filter accounts options by company
|
|
||||||
this.filter_inputs.company.on("change", function() {
|
|
||||||
me.setup_account_filter(this);
|
|
||||||
me.refresh();
|
|
||||||
});
|
|
||||||
|
|
||||||
this.trigger_refresh_on_change(["group_by_ledger", "group_by_voucher"]);
|
|
||||||
},
|
|
||||||
setup_account_filter: function(company_filter) {
|
|
||||||
var me = this;
|
|
||||||
|
|
||||||
var $account = me.filter_inputs.account;
|
|
||||||
var company = $(company_filter).val();
|
|
||||||
var default_company = this.filter_inputs.company.get(0).opts.default_value;
|
|
||||||
var opts = $account.get(0).opts;
|
|
||||||
opts.list = $.map(wn.report_dump.data["Account"], function(ac) {
|
|
||||||
return (company===default_company ||
|
|
||||||
me.accounts_by_company[company].indexOf(ac.name)!=-1) ?
|
|
||||||
ac.name : null;
|
|
||||||
});
|
|
||||||
|
|
||||||
this.set_autocomplete($account, opts.list);
|
|
||||||
|
|
||||||
},
|
|
||||||
init_filter_values: function() {
|
|
||||||
this._super();
|
|
||||||
this.toggle_group_by_checks();
|
|
||||||
this.filter_inputs.company.trigger("change");
|
|
||||||
},
|
|
||||||
apply_filters_from_route: function() {
|
|
||||||
this._super();
|
|
||||||
this.toggle_group_by_checks();
|
|
||||||
},
|
|
||||||
make_accounts_by_company: function() {
|
|
||||||
var accounts_by_company = {};
|
|
||||||
var me = this;
|
|
||||||
$.each(wn.report_dump.data["Account"], function(i, ac) {
|
|
||||||
if(!accounts_by_company[ac.company]) accounts_by_company[ac.company] = [];
|
|
||||||
accounts_by_company[ac.company].push(ac.name);
|
|
||||||
});
|
|
||||||
return accounts_by_company;
|
|
||||||
},
|
|
||||||
is_child_account: function(account, item_account) {
|
|
||||||
account = this.account_by_name[account];
|
|
||||||
item_account = this.account_by_name[item_account];
|
|
||||||
return ((item_account.lft >= account.lft) && (item_account.rgt <= account.rgt));
|
|
||||||
},
|
|
||||||
toggle_group_by_checks: function() {
|
|
||||||
this.make_account_by_name();
|
|
||||||
|
|
||||||
// this.filter_inputs.group_by_ledger
|
|
||||||
// .parent().toggle(!!(this.account_by_name[this.account]
|
|
||||||
// && this.account_by_name[this.account].group_or_ledger==="Group"));
|
|
||||||
//
|
|
||||||
// this.filter_inputs.group_by_voucher
|
|
||||||
// .parent().toggle(!!(this.account_by_name[this.account]
|
|
||||||
// && this.account_by_name[this.account].group_or_ledger==="Ledger"));
|
|
||||||
},
|
|
||||||
prepare_data: function() {
|
|
||||||
var me = this;
|
|
||||||
var data = wn.report_dump.data["GL Entry"];
|
|
||||||
var out = [];
|
|
||||||
|
|
||||||
this.toggle_group_by_checks();
|
|
||||||
|
|
||||||
var from_date = dateutil.str_to_obj(this.from_date);
|
|
||||||
var to_date = dateutil.str_to_obj(this.to_date);
|
|
||||||
|
|
||||||
if(to_date < from_date) {
|
|
||||||
msgprint(wn._("From Date must be before To Date"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// add Opening, Closing, Totals rows
|
|
||||||
// if filtered by account and / or voucher
|
|
||||||
var opening = this.make_summary_row("Opening", this.account);
|
|
||||||
var totals = this.make_summary_row("Totals", this.account);
|
|
||||||
|
|
||||||
var grouped_ledgers = {};
|
|
||||||
$.each(data, function(i, item) {
|
|
||||||
if(me.apply_filter(item, "company") &&
|
|
||||||
(me.account ? me.is_child_account(me.account, item.account)
|
|
||||||
: true) && (me.voucher_no ? item.voucher_no==me.voucher_no : true)) {
|
|
||||||
var date = dateutil.str_to_obj(item.posting_date);
|
|
||||||
|
|
||||||
// create grouping by ledger
|
|
||||||
if(!grouped_ledgers[item.account]) {
|
|
||||||
grouped_ledgers[item.account] = {
|
|
||||||
entries: [],
|
|
||||||
entries_group_by_voucher: {},
|
|
||||||
opening: me.make_summary_row("Opening", item.account),
|
|
||||||
totals: me.make_summary_row("Totals", item.account),
|
|
||||||
closing: me.make_summary_row("Closing (Opening + Totals)",
|
|
||||||
item.account)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]) {
|
|
||||||
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] = {
|
|
||||||
row: {},
|
|
||||||
totals: {"debit": 0, "credit": 0}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!me.voucher_no && (date < from_date || item.is_opening=="Yes")) {
|
|
||||||
opening.debit += item.debit;
|
|
||||||
opening.credit += item.credit;
|
|
||||||
|
|
||||||
grouped_ledgers[item.account].opening.debit += item.debit;
|
|
||||||
grouped_ledgers[item.account].opening.credit += item.credit;
|
|
||||||
|
|
||||||
} else if(date <= to_date) {
|
|
||||||
|
|
||||||
totals.debit += item.debit;
|
|
||||||
totals.credit += item.credit;
|
|
||||||
|
|
||||||
grouped_ledgers[item.account].totals.debit += item.debit;
|
|
||||||
grouped_ledgers[item.account].totals.credit += item.credit;
|
|
||||||
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
|
|
||||||
.totals.debit += item.debit;
|
|
||||||
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
|
|
||||||
.totals.credit += item.credit;
|
|
||||||
}
|
|
||||||
if(item.account) {
|
|
||||||
item.against_account = me.voucher_accounts[item.voucher_type + ":"
|
|
||||||
+ item.voucher_no][(item.debit > 0 ? "credits" : "debits")].join(", ");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(me.apply_filters(item) && (me.voucher_no || item.is_opening=="No")) {
|
|
||||||
out.push(item);
|
|
||||||
grouped_ledgers[item.account].entries.push(item);
|
|
||||||
|
|
||||||
if(grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no].row){
|
|
||||||
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
|
|
||||||
.row = $.extend({}, item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var closing = this.make_summary_row("Closing (Opening + Totals)", this.account);
|
|
||||||
closing.debit = opening.debit + totals.debit;
|
|
||||||
closing.credit = opening.credit + totals.credit;
|
|
||||||
|
|
||||||
if(me.account) {
|
|
||||||
me.appframe.set_title(wn._("General Ledger: ") + me.account);
|
|
||||||
|
|
||||||
// group by ledgers
|
|
||||||
if(this.account_by_name[this.account].group_or_ledger==="Group"
|
|
||||||
&& this.group_by_ledger) {
|
|
||||||
out = this.group_data_by_ledger(grouped_ledgers);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(this.account_by_name[this.account].group_or_ledger==="Ledger"
|
|
||||||
&& this.group_by_voucher) {
|
|
||||||
out = this.group_data_by_voucher(grouped_ledgers);
|
|
||||||
}
|
|
||||||
|
|
||||||
opening = me.get_balance(me.account_by_name[me.account].debit_or_credit, opening)
|
|
||||||
closing = me.get_balance(me.account_by_name[me.account].debit_or_credit, closing)
|
|
||||||
|
|
||||||
out = [opening].concat(out).concat([totals, closing]);
|
|
||||||
} else {
|
|
||||||
me.appframe.set_title(wn._("General Ledger"));
|
|
||||||
out = out.concat([totals]);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.data = out;
|
|
||||||
},
|
|
||||||
|
|
||||||
group_data_by_ledger: function(grouped_ledgers) {
|
|
||||||
var me = this;
|
|
||||||
var out = []
|
|
||||||
$.each(Object.keys(grouped_ledgers).sort(), function(i, account) {
|
|
||||||
if(grouped_ledgers[account].entries.length) {
|
|
||||||
grouped_ledgers[account].closing.debit =
|
|
||||||
grouped_ledgers[account].opening.debit
|
|
||||||
+ grouped_ledgers[account].totals.debit;
|
|
||||||
|
|
||||||
grouped_ledgers[account].closing.credit =
|
|
||||||
grouped_ledgers[account].opening.credit
|
|
||||||
+ grouped_ledgers[account].totals.credit;
|
|
||||||
|
|
||||||
grouped_ledgers[account].opening =
|
|
||||||
me.get_balance(me.account_by_name[me.account].debit_or_credit,
|
|
||||||
grouped_ledgers[account].opening)
|
|
||||||
grouped_ledgers[account].closing =
|
|
||||||
me.get_balance(me.account_by_name[me.account].debit_or_credit,
|
|
||||||
grouped_ledgers[account].closing)
|
|
||||||
|
|
||||||
out = out.concat([grouped_ledgers[account].opening])
|
|
||||||
.concat(grouped_ledgers[account].entries)
|
|
||||||
.concat([grouped_ledgers[account].totals,
|
|
||||||
grouped_ledgers[account].closing,
|
|
||||||
{id: "_blank" + i, debit: "", credit: ""}]);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return [{id: "_blank_first", debit: "", credit: ""}].concat(out);
|
|
||||||
},
|
|
||||||
|
|
||||||
group_data_by_voucher: function(grouped_ledgers) {
|
|
||||||
var me = this;
|
|
||||||
var out = []
|
|
||||||
$.each(Object.keys(grouped_ledgers).sort(), function(i, account) {
|
|
||||||
if(grouped_ledgers[account].entries.length) {
|
|
||||||
$.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher),
|
|
||||||
function(j, voucher) {
|
|
||||||
voucher_dict = grouped_ledgers[account].entries_group_by_voucher[voucher];
|
|
||||||
if(voucher_dict &&
|
|
||||||
(voucher_dict.totals.debit || voucher_dict.totals.credit)) {
|
|
||||||
voucher_dict.row.debit = voucher_dict.totals.debit;
|
|
||||||
voucher_dict.row.credit = voucher_dict.totals.credit;
|
|
||||||
voucher_dict.row.id = "entry_grouped_by_" + voucher
|
|
||||||
out = out.concat(voucher_dict.row);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return out;
|
|
||||||
},
|
|
||||||
|
|
||||||
get_balance: function(debit_or_credit, balance) {
|
|
||||||
if(debit_or_credit == "Debit") {
|
|
||||||
balance.debit -= balance.credit; balance.credit = 0;
|
|
||||||
} else {
|
|
||||||
balance.credit -= balance.debit; balance.debit = 0;
|
|
||||||
}
|
|
||||||
return balance
|
|
||||||
},
|
|
||||||
|
|
||||||
make_summary_row: function(label, item_account) {
|
|
||||||
return {
|
|
||||||
account: label,
|
|
||||||
debit: 0.0,
|
|
||||||
credit: 0.0,
|
|
||||||
id: ["", label, item_account].join("_").replace(" ", "_").toLowerCase(),
|
|
||||||
_show: true,
|
|
||||||
_style: "font-weight: bold"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
make_account_by_name: function() {
|
|
||||||
this.account_by_name = this.make_name_map(wn.report_dump.data["Account"]);
|
|
||||||
this.make_voucher_accounts_map();
|
|
||||||
},
|
|
||||||
|
|
||||||
make_voucher_accounts_map: function() {
|
|
||||||
this.voucher_accounts = {};
|
|
||||||
var data = wn.report_dump.data["GL Entry"];
|
|
||||||
for(var i=0, j=data.length; i<j; i++) {
|
|
||||||
var gl = data[i];
|
|
||||||
|
|
||||||
if(!this.voucher_accounts[gl.voucher_type + ":" + gl.voucher_no])
|
|
||||||
this.voucher_accounts[gl.voucher_type + ":" + gl.voucher_no] = {
|
|
||||||
debits: [],
|
|
||||||
credits: []
|
|
||||||
}
|
|
||||||
|
|
||||||
var va = this.voucher_accounts[gl.voucher_type + ":" + gl.voucher_no];
|
|
||||||
if(gl.debit > 0) {
|
|
||||||
va.debits.push(gl.account);
|
|
||||||
} else {
|
|
||||||
va.credits.push(gl.account);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
get_plot_data: function() {
|
|
||||||
var data = [];
|
|
||||||
var me = this;
|
|
||||||
if(!me.account || me.voucher_no) return false;
|
|
||||||
var debit_or_credit = me.account_by_name[me.account].debit_or_credit;
|
|
||||||
var balance = debit_or_credit=="Debit" ? me.data[0].debit : me.data[0].credit;
|
|
||||||
data.push({
|
|
||||||
label: me.account,
|
|
||||||
data: [[dateutil.str_to_obj(me.from_date).getTime(), balance]]
|
|
||||||
.concat($.map(me.data, function(col, idx) {
|
|
||||||
if (col.posting_date) {
|
|
||||||
var diff = (debit_or_credit == "Debit" ? 1 : -1) * (flt(col.debit) - flt(col.credit));
|
|
||||||
balance += diff;
|
|
||||||
return [[dateutil.str_to_obj(col.posting_date).getTime(), balance - diff],
|
|
||||||
[dateutil.str_to_obj(col.posting_date).getTime(), balance]]
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
})).concat([
|
|
||||||
// closing
|
|
||||||
[dateutil.str_to_obj(me.to_date).getTime(), 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 } }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"creation": "2012-09-14 11:25:48",
|
|
||||||
"docstatus": 0,
|
|
||||||
"modified": "2013-07-11 14:42:21",
|
|
||||||
"modified_by": "Administrator",
|
|
||||||
"owner": "Administrator"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"icon": "icon-table",
|
|
||||||
"module": "Accounts",
|
|
||||||
"name": "__common__",
|
|
||||||
"page_name": "general-ledger",
|
|
||||||
"standard": "Yes",
|
|
||||||
"title": "General Ledger"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"name": "__common__",
|
|
||||||
"parent": "general-ledger",
|
|
||||||
"parentfield": "roles",
|
|
||||||
"parenttype": "Page"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"name": "general-ledger"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Analytics"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Accounts Manager"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Accounts User"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
51
accounts/report/general_ledger/general_ledger.js
Normal file
51
accounts/report/general_ledger/general_ledger.js
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
// License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
wn.query_reports["General Ledger"] = {
|
||||||
|
"filters": [
|
||||||
|
{
|
||||||
|
"fieldname":"company",
|
||||||
|
"label": wn._("Company"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Company",
|
||||||
|
"default": wn.defaults.get_user_default("company"),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"account",
|
||||||
|
"label": wn._("Account"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Account"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"voucher_no",
|
||||||
|
"label": wn._("Voucher No"),
|
||||||
|
"fieldtype": "Data",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"group_by",
|
||||||
|
"label": wn._("Group by"),
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"options": "\nGroup by Account\nGroup by Voucher"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldtype": "Break",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"from_date",
|
||||||
|
"label": wn._("From Date"),
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"default": wn.datetime.add_months(wn.datetime.get_today(), -1),
|
||||||
|
"reqd": 1,
|
||||||
|
"width": "60px"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"to_date",
|
||||||
|
"label": wn._("To Date"),
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"default": wn.datetime.get_today(),
|
||||||
|
"reqd": 1,
|
||||||
|
"width": "60px"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
79
accounts/report/general_ledger/general_ledger.py
Normal file
79
accounts/report/general_ledger/general_ledger.py
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
import webnotes
|
||||||
|
from webnotes.utils import flt
|
||||||
|
from webnotes import _
|
||||||
|
|
||||||
|
def execute(filters=None):
|
||||||
|
validate_filters(filters)
|
||||||
|
columns = get_columns()
|
||||||
|
|
||||||
|
if filters.get("group_by"):
|
||||||
|
data = get_grouped_gle(filters)
|
||||||
|
else:
|
||||||
|
data = get_gl_entries(filters)
|
||||||
|
if data:
|
||||||
|
data.append(get_total_row(data))
|
||||||
|
|
||||||
|
return columns, data
|
||||||
|
|
||||||
|
def validate_filters(filters):
|
||||||
|
if filters.get("account") and filters.get("group_by") == "Group by Account":
|
||||||
|
webnotes.throw(_("Can not filter based on Account, if grouped by Account"))
|
||||||
|
|
||||||
|
if filters.get("voucher_no") and filters.get("group_by") == "Group by Voucher":
|
||||||
|
webnotes.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
|
||||||
|
|
||||||
|
def get_columns():
|
||||||
|
return ["Posting Date:Date:100", "Account:Link/Account:200", "Debit:Currency:100",
|
||||||
|
"Credit:Currency:100", "Voucher Type::120", "Voucher No::160",
|
||||||
|
"Cost Center:Link/Cost Center:100", "Remarks::200"]
|
||||||
|
|
||||||
|
def get_gl_entries(filters):
|
||||||
|
return webnotes.conn.sql("""select
|
||||||
|
posting_date, account, debit, credit, voucher_type, voucher_no, cost_center, remarks
|
||||||
|
from `tabGL Entry`
|
||||||
|
where company=%(company)s
|
||||||
|
and posting_date between %(from_date)s and %(to_date)s
|
||||||
|
{conditions}
|
||||||
|
order by posting_date, account"""\
|
||||||
|
.format(conditions=get_conditions(filters)), filters, as_list=1)
|
||||||
|
|
||||||
|
def get_conditions(filters):
|
||||||
|
conditions = []
|
||||||
|
if filters.get("account"):
|
||||||
|
conditions.append("account=%(account)s")
|
||||||
|
if filters.get("voucher_no"):
|
||||||
|
conditions.append("voucher_no=%(voucher_no)s")
|
||||||
|
|
||||||
|
return "and {}".format(" and ".join(conditions)) if conditions else ""
|
||||||
|
|
||||||
|
def get_grouped_gle(filters):
|
||||||
|
gle_map = {}
|
||||||
|
gle = get_gl_entries(filters)
|
||||||
|
for d in gle:
|
||||||
|
gle_map.setdefault(d[1 if filters["group_by"]=="Group by Account" else 5], []).append(d)
|
||||||
|
|
||||||
|
data = []
|
||||||
|
for entries in gle_map.values():
|
||||||
|
subtotal_debit = subtotal_credit = 0.0
|
||||||
|
for entry in entries:
|
||||||
|
data.append(entry)
|
||||||
|
subtotal_debit += flt(entry[2])
|
||||||
|
subtotal_credit += flt(entry[3])
|
||||||
|
|
||||||
|
data.append(["", "Total", subtotal_debit, subtotal_credit, "", "", ""])
|
||||||
|
|
||||||
|
if data:
|
||||||
|
data.append(get_total_row(gle))
|
||||||
|
return data
|
||||||
|
|
||||||
|
def get_total_row(gle):
|
||||||
|
total_debit = total_credit = 0.0
|
||||||
|
for d in gle:
|
||||||
|
total_debit += flt(d[2])
|
||||||
|
total_credit += flt(d[3])
|
||||||
|
|
||||||
|
return ["", "Total Debit/Credit", total_debit, total_credit, "", "", ""]
|
||||||
21
accounts/report/general_ledger/general_ledger.txt
Normal file
21
accounts/report/general_ledger/general_ledger.txt
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"creation": "2013-12-06 13:22:23",
|
||||||
|
"docstatus": 0,
|
||||||
|
"modified": "2013-12-06 13:22:23",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"owner": "Administrator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"doctype": "Report",
|
||||||
|
"is_standard": "Yes",
|
||||||
|
"name": "__common__",
|
||||||
|
"ref_doctype": "GL Entry",
|
||||||
|
"report_name": "General Ledger",
|
||||||
|
"report_type": "Script Report"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"doctype": "Report",
|
||||||
|
"name": "General Ledger"
|
||||||
|
}
|
||||||
|
]
|
||||||
17
patches/1312/p01_delete_old_stock_reports.py
Normal file
17
patches/1312/p01_delete_old_stock_reports.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
def execute():
|
||||||
|
import webnotes, os, shutil
|
||||||
|
from webnotes.utils import get_base_path
|
||||||
|
|
||||||
|
webnotes.delete_doc('Page', 'stock-ledger')
|
||||||
|
webnotes.delete_doc('Page', 'stock-ageing')
|
||||||
|
webnotes.delete_doc('Page', 'stock-level')
|
||||||
|
webnotes.delete_doc('Page', 'general-ledger')
|
||||||
|
|
||||||
|
for d in [["stock", "stock_ledger"], ["stock", "stock_ageing"],
|
||||||
|
["stock", "stock_level"], ["accounts", "general_ledger"]]:
|
||||||
|
path = os.path.join(get_base_path(), "app", d[0], "page", d[1])
|
||||||
|
if os.path.exists(path):
|
||||||
|
shutil.rmtree(path)
|
||||||
@ -256,6 +256,7 @@ patch_list = [
|
|||||||
"patches.1311.p06_fix_report_columns",
|
"patches.1311.p06_fix_report_columns",
|
||||||
"execute:webnotes.delete_doc('DocType', 'Documentation Tool')",
|
"execute:webnotes.delete_doc('DocType', 'Documentation Tool')",
|
||||||
"execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29",
|
"execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29",
|
||||||
|
"patches.1312.p01_delete_old_stock_reports",
|
||||||
"execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')",
|
"execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')",
|
||||||
"execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')",
|
"execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')",
|
||||||
"patches.1311.p07_scheduler_errors_digest",
|
"patches.1311.p07_scheduler_errors_digest",
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import webnotes
|
import webnotes
|
||||||
|
|
||||||
from webnotes.utils import cstr, flt, cint
|
from webnotes.utils import cstr, flt
|
||||||
from webnotes.model.doc import addchild
|
from webnotes.model.doc import addchild
|
||||||
from webnotes.model.bean import getlist
|
from webnotes.model.bean import getlist
|
||||||
from webnotes import msgprint, _
|
from webnotes import msgprint, _
|
||||||
@ -116,40 +116,29 @@ class DocType(DocListController, WebsiteGenerator):
|
|||||||
self.doc.is_pro_applicable = "No"
|
self.doc.is_pro_applicable = "No"
|
||||||
|
|
||||||
if self.doc.is_pro_applicable == 'Yes' and self.doc.is_stock_item == 'No':
|
if self.doc.is_pro_applicable == 'Yes' and self.doc.is_stock_item == 'No':
|
||||||
msgprint("As Production Order can be made for this Item, then Is Stock Item Should be 'Yes' as we maintain it's stock. Refer Manufacturing and Inventory section.", raise_exception=1)
|
webnotes.throw(_("As Production Order can be made for this item, \
|
||||||
|
it must be a stock item."))
|
||||||
|
|
||||||
if self.doc.has_serial_no == 'Yes' and self.doc.is_stock_item == 'No':
|
if self.doc.has_serial_no == 'Yes' and self.doc.is_stock_item == 'No':
|
||||||
msgprint("'Has Serial No' can not be 'Yes' for non-stock item", raise_exception=1)
|
msgprint("'Has Serial No' can not be 'Yes' for non-stock item", raise_exception=1)
|
||||||
|
|
||||||
def check_for_active_boms(self):
|
def check_for_active_boms(self):
|
||||||
def _check_for_active_boms(field_label):
|
if self.doc.is_active != "Yes" or self.doc.is_purchase_item != "Yes":
|
||||||
if field_label in ['Is Active', 'Is Purchase Item']:
|
bom_mat = webnotes.conn.sql("""select distinct t1.parent
|
||||||
bom_mat = webnotes.conn.sql("""select distinct t1.parent
|
from `tabBOM Item` t1, `tabBOM` t2 where t2.name = t1.parent
|
||||||
from `tabBOM Item` t1, `tabBOM` t2 where t2.name = t1.parent
|
and t1.item_code =%s and ifnull(t1.bom_no, '') = '' and t2.is_active = 1
|
||||||
and t1.item_code =%s and ifnull(t1.bom_no, '') = '' and t2.is_active = 1
|
and t2.docstatus = 1 and t1.docstatus =1 """, self.doc.name)
|
||||||
and t2.docstatus = 1 and t1.docstatus =1 """, self.doc.name)
|
|
||||||
if bom_mat and bom_mat[0][0]:
|
if bom_mat and bom_mat[0][0]:
|
||||||
msgprint(_(field_label) + _(" should be 'Yes'. As Item: ") + self.doc.name +
|
webnotes.throw(_("Item must be active and purchase item, \
|
||||||
_(" is present in one or many Active BOMs"), raise_exception=1)
|
as it is present in one or many Active BOMs"))
|
||||||
|
|
||||||
if ((field_label == 'Allow Production Order'
|
if self.doc.is_manufactured_item != "Yes":
|
||||||
and self.doc.is_sub_contracted_item != 'Yes')
|
bom = webnotes.conn.sql("""select name from `tabBOM` where item = %s
|
||||||
or (field_label == 'Is Sub Contracted Item'
|
and is_active = 1""", (self.doc.name,))
|
||||||
and self.doc.is_manufactured_item != 'Yes')):
|
if bom and bom[0][0]:
|
||||||
bom = webnotes.conn.sql("""select name from `tabBOM` where item = %s
|
webnotes.throw(_("""Allow Bill of Materials should be 'Yes'. Because one or many \
|
||||||
and is_active = 1""", (self.doc.name,))
|
active BOMs present for this item"""))
|
||||||
if bom and bom[0][0]:
|
|
||||||
msgprint(_(field_label) + _(" should be 'Yes'. As Item: ") + self.doc.name +
|
|
||||||
_(" is present in one or many Active BOMs"), raise_exception=1)
|
|
||||||
|
|
||||||
if not cint(self.doc.fields.get("__islocal")):
|
|
||||||
fl = {'is_manufactured_item' :'Allow Bill of Materials',
|
|
||||||
'is_sub_contracted_item':'Is Sub Contracted Item',
|
|
||||||
'is_purchase_item' :'Is Purchase Item',
|
|
||||||
'is_pro_applicable' :'Allow Production Order'}
|
|
||||||
for d in fl:
|
|
||||||
if cstr(self.doc.fields.get(d)) != 'Yes':
|
|
||||||
_check_for_active_boms(fl[d])
|
|
||||||
|
|
||||||
def fill_customer_code(self):
|
def fill_customer_code(self):
|
||||||
""" Append all the customer codes and insert into "customer_code" field of item table """
|
""" Append all the customer codes and insert into "customer_code" field of item table """
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Average "age" of an Item in a particular Warehouse based on First-in-first-out (FIFO).
|
|
||||||
@ -1 +0,0 @@
|
|||||||
from __future__ import unicode_literals
|
|
||||||
@ -1,183 +0,0 @@
|
|||||||
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
|
||||||
// License: GNU General Public License v3. See license.txt
|
|
||||||
|
|
||||||
|
|
||||||
wn.pages['stock-ageing'].onload = function(wrapper) {
|
|
||||||
wn.ui.make_app_page({
|
|
||||||
parent: wrapper,
|
|
||||||
title: wn._('Stock Ageing'),
|
|
||||||
single_column: true
|
|
||||||
});
|
|
||||||
|
|
||||||
new erpnext.StockAgeing(wrapper);
|
|
||||||
|
|
||||||
|
|
||||||
wrapper.appframe.add_module_icon("Stock")
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
wn.require("app/js/stock_grid_report.js");
|
|
||||||
|
|
||||||
erpnext.StockAgeing = erpnext.StockGridReport.extend({
|
|
||||||
init: function(wrapper) {
|
|
||||||
this._super({
|
|
||||||
title: wn._("Stock Ageing"),
|
|
||||||
page: wrapper,
|
|
||||||
parent: $(wrapper).find('.layout-main'),
|
|
||||||
appframe: wrapper.appframe,
|
|
||||||
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand", "Serial No"],
|
|
||||||
})
|
|
||||||
},
|
|
||||||
setup_columns: function() {
|
|
||||||
this.columns = [
|
|
||||||
{id: "name", name: wn._("Item"), field: "name", width: 300,
|
|
||||||
link_formatter: {
|
|
||||||
open_btn: true,
|
|
||||||
doctype: '"Item"'
|
|
||||||
}},
|
|
||||||
{id: "item_name", name: wn._("Item Name"), field: "item_name",
|
|
||||||
width: 100, formatter: this.text_formatter},
|
|
||||||
{id: "description", name: wn._("Description"), field: "description",
|
|
||||||
width: 200, formatter: this.text_formatter},
|
|
||||||
{id: "brand", name: wn._("Brand"), field: "brand", width: 100},
|
|
||||||
{id: "average_age", name: wn._("Average Age"), field: "average_age",
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "earliest", name: wn._("Earliest"), field: "earliest",
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "latest", name: wn._("Latest"), field: "latest",
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
|
|
||||||
];
|
|
||||||
},
|
|
||||||
filters: [
|
|
||||||
{fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
|
|
||||||
default_value: "Select Warehouse..."},
|
|
||||||
{fieldtype:"Select", label: wn._("Brand"), link:"Brand",
|
|
||||||
default_value: "Select Brand...", filter: function(val, item, opts) {
|
|
||||||
return val == opts.default_value || item.brand == val;
|
|
||||||
}, link_formatter: {filter_input: "brand"}},
|
|
||||||
{fieldtype:"Select", label: wn._("Plot By"),
|
|
||||||
options: ["Average Age", "Earliest", "Latest"]},
|
|
||||||
{fieldtype:"Date", label: wn._("To Date")},
|
|
||||||
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
|
|
||||||
{fieldtype:"Button", label: wn._("Reset Filters")}
|
|
||||||
],
|
|
||||||
setup_filters: function() {
|
|
||||||
var me = this;
|
|
||||||
this._super();
|
|
||||||
this.trigger_refresh_on_change(["warehouse", "plot_by", "brand"]);
|
|
||||||
this.show_zero_check();
|
|
||||||
},
|
|
||||||
init_filter_values: function() {
|
|
||||||
this._super();
|
|
||||||
this.filter_inputs.to_date.val(dateutil.obj_to_user(new Date()));
|
|
||||||
},
|
|
||||||
prepare_data: function() {
|
|
||||||
var me = this;
|
|
||||||
|
|
||||||
if(!this.data) {
|
|
||||||
me._data = wn.report_dump.data["Item"];
|
|
||||||
me.item_by_name = me.make_name_map(me._data);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.data = [].concat(this._data);
|
|
||||||
|
|
||||||
this.serialized_buying_rates = this.get_serialized_buying_rates();
|
|
||||||
|
|
||||||
$.each(this.data, function(i, d) {
|
|
||||||
me.reset_item_values(d);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.prepare_balances();
|
|
||||||
|
|
||||||
// filter out brand
|
|
||||||
this.data = $.map(this.data, function(d) {
|
|
||||||
return me.apply_filter(d, "brand") ? d : null;
|
|
||||||
});
|
|
||||||
|
|
||||||
// filter out rows with zero values
|
|
||||||
this.data = $.map(this.data, function(d) {
|
|
||||||
return me.apply_zero_filter(null, d, null, me) ? d : null;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
prepare_balances: function() {
|
|
||||||
var me = this;
|
|
||||||
var to_date = dateutil.str_to_obj(this.to_date);
|
|
||||||
var data = wn.report_dump.data["Stock Ledger Entry"];
|
|
||||||
|
|
||||||
this.item_warehouse = {};
|
|
||||||
|
|
||||||
for(var i=0, j=data.length; i<j; i++) {
|
|
||||||
var sl = data[i];
|
|
||||||
var posting_date = dateutil.str_to_obj(sl.posting_date);
|
|
||||||
|
|
||||||
if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) {
|
|
||||||
var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);
|
|
||||||
|
|
||||||
// call diff to build fifo stack in item_warehouse
|
|
||||||
var diff = me.get_value_diff(wh, sl, true);
|
|
||||||
|
|
||||||
if(posting_date > to_date)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$.each(me.data, function(i, item) {
|
|
||||||
var full_fifo_stack = [];
|
|
||||||
if(me.is_default("warehouse")) {
|
|
||||||
$.each(me.item_warehouse[item.name] || {}, function(i, wh) {
|
|
||||||
full_fifo_stack = full_fifo_stack.concat(wh.fifo_stack || [])
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
full_fifo_stack = me.get_item_warehouse(me.warehouse, item.name).fifo_stack || [];
|
|
||||||
}
|
|
||||||
|
|
||||||
var age_qty = total_qty = 0.0;
|
|
||||||
var min_age = max_age = null;
|
|
||||||
|
|
||||||
$.each(full_fifo_stack, function(i, batch) {
|
|
||||||
var batch_age = dateutil.get_diff(me.to_date, batch[2]);
|
|
||||||
age_qty += batch_age * batch[0];
|
|
||||||
total_qty += batch[0];
|
|
||||||
max_age = Math.max(max_age, batch_age);
|
|
||||||
if(min_age===null) min_age=batch_age;
|
|
||||||
else min_age = Math.min(min_age, batch_age);
|
|
||||||
});
|
|
||||||
|
|
||||||
item.average_age = total_qty.toFixed(2)==0.0 ? 0
|
|
||||||
: (age_qty / total_qty).toFixed(2);
|
|
||||||
item.earliest = max_age || 0.0;
|
|
||||||
item.latest = min_age || 0.0;
|
|
||||||
});
|
|
||||||
|
|
||||||
this.data = this.data.sort(function(a, b) {
|
|
||||||
var sort_by = me.plot_by.replace(" ", "_").toLowerCase();
|
|
||||||
return b[sort_by] - a[sort_by];
|
|
||||||
});
|
|
||||||
},
|
|
||||||
get_plot_data: function() {
|
|
||||||
var data = [];
|
|
||||||
var me = this;
|
|
||||||
|
|
||||||
data.push({
|
|
||||||
label: me.plot_by,
|
|
||||||
data: $.map(me.data, function(item, idx) {
|
|
||||||
return [[idx+1, item[me.plot_by.replace(" ", "_").toLowerCase() ]]]
|
|
||||||
}),
|
|
||||||
bars: {show: true},
|
|
||||||
});
|
|
||||||
|
|
||||||
return data.length ? data : false;
|
|
||||||
},
|
|
||||||
get_plot_options: function() {
|
|
||||||
var me = this;
|
|
||||||
return {
|
|
||||||
grid: { hoverable: true, clickable: true },
|
|
||||||
xaxis: {
|
|
||||||
ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }),
|
|
||||||
max: 15
|
|
||||||
},
|
|
||||||
series: { downsample: { threshold: 1000 } }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"creation": "2012-09-21 20:15:14",
|
|
||||||
"docstatus": 0,
|
|
||||||
"modified": "2013-07-11 14:44:08",
|
|
||||||
"modified_by": "Administrator",
|
|
||||||
"owner": "Administrator"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"icon": "icon-table",
|
|
||||||
"module": "Stock",
|
|
||||||
"name": "__common__",
|
|
||||||
"page_name": "stock-ageing",
|
|
||||||
"standard": "Yes",
|
|
||||||
"title": "Stock Ageing"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"name": "__common__",
|
|
||||||
"parent": "stock-ageing",
|
|
||||||
"parentfield": "roles",
|
|
||||||
"parenttype": "Page"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"name": "stock-ageing"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Analytics"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Material Manager"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -138,7 +138,7 @@ wn.module_page["Stock"] = [
|
|||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
"label":wn._("Stock Ledger"),
|
"label":wn._("Stock Ledger"),
|
||||||
doctype: "Delivery Note",
|
doctype: "Item",
|
||||||
route: "query-report/Stock Ledger"
|
route: "query-report/Stock Ledger"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -146,12 +146,14 @@ wn.module_page["Stock"] = [
|
|||||||
page: "stock-balance"
|
page: "stock-balance"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"page":"stock-level",
|
"label":wn._("Stock Projected Qty"),
|
||||||
"label": wn._("Stock Level")
|
doctype: "Item",
|
||||||
|
route: "query-report/Stock Projected Qty"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"page":"stock-ageing",
|
"label":wn._("Stock Ageing"),
|
||||||
"label": wn._("Stock Ageing")
|
doctype: "Item",
|
||||||
|
route: "query-report/Stock Ageing"
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Stock movement report based on Stock Ledger Entry.
|
|
||||||
@ -1 +0,0 @@
|
|||||||
from __future__ import unicode_literals
|
|
||||||
@ -1,247 +0,0 @@
|
|||||||
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
|
||||||
// License: GNU General Public License v3. See license.txt
|
|
||||||
|
|
||||||
wn.pages['stock-ledger'].onload = function(wrapper) {
|
|
||||||
wn.ui.make_app_page({
|
|
||||||
parent: wrapper,
|
|
||||||
title: wn._('Stock Ledger'),
|
|
||||||
single_column: true
|
|
||||||
});
|
|
||||||
|
|
||||||
new erpnext.StockLedger(wrapper);
|
|
||||||
wrapper.appframe.add_module_icon("Stock")
|
|
||||||
}
|
|
||||||
|
|
||||||
wn.require("app/js/stock_grid_report.js");
|
|
||||||
|
|
||||||
erpnext.StockLedger = erpnext.StockGridReport.extend({
|
|
||||||
init: function(wrapper) {
|
|
||||||
this._super({
|
|
||||||
title: wn._("Stock Ledger"),
|
|
||||||
page: wrapper,
|
|
||||||
parent: $(wrapper).find('.layout-main'),
|
|
||||||
appframe: wrapper.appframe,
|
|
||||||
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: wn._("Posting Date"), field: "posting_datetime", width: 120,
|
|
||||||
formatter: this.date_formatter},
|
|
||||||
{id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160,
|
|
||||||
link_formatter: {
|
|
||||||
filter_input: "item_code",
|
|
||||||
open_btn: true,
|
|
||||||
doctype: '"Item"',
|
|
||||||
}},
|
|
||||||
{id: "description", name: wn._("Description"), field: "description", width: 200,
|
|
||||||
formatter: this.text_formatter},
|
|
||||||
{id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100,
|
|
||||||
link_formatter: {filter_input: "warehouse"}},
|
|
||||||
{id: "brand", name: wn._("Brand"), field: "brand", width: 100},
|
|
||||||
{id: "stock_uom", name: wn._("UOM"), field: "stock_uom", width: 100},
|
|
||||||
{id: "qty", name: wn._("Qty"), field: "qty", width: 100,
|
|
||||||
formatter: this.currency_formatter},
|
|
||||||
{id: "balance", name: wn._("Balance Qty"), field: "balance", width: 100,
|
|
||||||
formatter: this.currency_formatter,
|
|
||||||
hidden: this.hide_balance},
|
|
||||||
{id: "balance_value", name: wn._("Balance Value"), field: "balance_value", width: 100,
|
|
||||||
formatter: this.currency_formatter, hidden: this.hide_balance},
|
|
||||||
{id: "voucher_type", name: wn._("Voucher Type"), field: "voucher_type", width: 120},
|
|
||||||
{id: "voucher_no", name: wn._("Voucher No"), field: "voucher_no", width: 160,
|
|
||||||
link_formatter: {
|
|
||||||
filter_input: "voucher_no",
|
|
||||||
open_btn: true,
|
|
||||||
doctype: "dataContext.voucher_type"
|
|
||||||
}},
|
|
||||||
];
|
|
||||||
|
|
||||||
},
|
|
||||||
filters: [
|
|
||||||
{fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
|
|
||||||
default_value: "Select Warehouse...", filter: function(val, item, opts) {
|
|
||||||
return item.warehouse == val || val == opts.default_value;
|
|
||||||
}},
|
|
||||||
{fieldtype:"Link", label: wn._("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: wn._("Voucher No"),
|
|
||||||
filter: function(val, item, opts) {
|
|
||||||
if(!val) return true;
|
|
||||||
return (item.voucher_no && item.voucher_no.indexOf(val)!=-1);
|
|
||||||
}},
|
|
||||||
{fieldtype:"Date", label: wn._("From Date"), filter: function(val, item) {
|
|
||||||
return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date);
|
|
||||||
}},
|
|
||||||
{fieldtype:"Label", label: wn._("To")},
|
|
||||||
{fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) {
|
|
||||||
return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date);
|
|
||||||
}},
|
|
||||||
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
|
|
||||||
{fieldtype:"Button", label: wn._("Reset Filters")}
|
|
||||||
],
|
|
||||||
|
|
||||||
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(wn.report_dump.data["Item"]);
|
|
||||||
var data = wn.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(wn.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;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"creation": "2012-09-21 20:15:14",
|
|
||||||
"docstatus": 0,
|
|
||||||
"modified": "2013-07-11 14:44:19",
|
|
||||||
"modified_by": "Administrator",
|
|
||||||
"owner": "Administrator"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"icon": "icon-table",
|
|
||||||
"module": "Stock",
|
|
||||||
"name": "__common__",
|
|
||||||
"page_name": "stock-ledger",
|
|
||||||
"standard": "Yes",
|
|
||||||
"title": "Stock Ledger"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"name": "__common__",
|
|
||||||
"parent": "stock-ledger",
|
|
||||||
"parentfield": "roles",
|
|
||||||
"parenttype": "Page"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"name": "stock-ledger"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Analytics"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Material Manager"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Material User"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Stock levels (actual, planned, reserved, ordered) for Items on a particular date.
|
|
||||||
@ -1,228 +0,0 @@
|
|||||||
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
|
||||||
// License: GNU General Public License v3. See license.txt
|
|
||||||
|
|
||||||
wn.pages['stock-level'].onload = function(wrapper) {
|
|
||||||
wn.ui.make_app_page({
|
|
||||||
parent: wrapper,
|
|
||||||
title: wn._('Stock Level'),
|
|
||||||
single_column: true
|
|
||||||
});
|
|
||||||
|
|
||||||
new erpnext.StockLevel(wrapper);
|
|
||||||
|
|
||||||
|
|
||||||
wrapper.appframe.add_module_icon("Stock")
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
wn.require("app/js/stock_grid_report.js");
|
|
||||||
|
|
||||||
erpnext.StockLevel = erpnext.StockGridReport.extend({
|
|
||||||
init: function(wrapper) {
|
|
||||||
var me = this;
|
|
||||||
|
|
||||||
this._super({
|
|
||||||
title: wn._("Stock Level"),
|
|
||||||
page: wrapper,
|
|
||||||
parent: $(wrapper).find('.layout-main'),
|
|
||||||
appframe: wrapper.appframe,
|
|
||||||
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() {
|
|
||||||
wn.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>"+wn._("Actual Qty: Quantity available in the warehouse.") +"</li>"+
|
|
||||||
"<li>"+wn._("Planned Qty: Quantity, for which, Production Order has been raised,")+
|
|
||||||
wn._("but is pending to be manufactured.")+ "</li> " +
|
|
||||||
"<li>"+wn._("Requested Qty: Quantity requested for purchase, but not ordered.") + "</li>" +
|
|
||||||
"<li>" + wn._("Ordered Qty: Quantity ordered for purchase, but not received.")+ "</li>" +
|
|
||||||
"<li>" + wn._("Reserved Qty: Quantity ordered for sale, but not delivered.") + "</li>" +
|
|
||||||
"</ul> \
|
|
||||||
</ul>");
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
setup_columns: function() {
|
|
||||||
this.columns = [
|
|
||||||
{id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160,
|
|
||||||
link_formatter: {
|
|
||||||
filter_input: "item_code",
|
|
||||||
open_btn: true,
|
|
||||||
doctype: '"Item"',
|
|
||||||
}},
|
|
||||||
{id: "item_name", name: wn._("Item Name"), field: "item_name", width: 100,
|
|
||||||
formatter: this.text_formatter},
|
|
||||||
{id: "description", name: wn._("Description"), field: "description", width: 200,
|
|
||||||
formatter: this.text_formatter},
|
|
||||||
{id: "brand", name: wn._("Brand"), field: "brand", width: 100,
|
|
||||||
link_formatter: {filter_input: "brand"}},
|
|
||||||
{id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100,
|
|
||||||
link_formatter: {filter_input: "warehouse"}},
|
|
||||||
{id: "uom", name: wn._("UOM"), field: "uom", width: 60},
|
|
||||||
{id: "actual_qty", name: wn._("Actual Qty"),
|
|
||||||
field: "actual_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "planned_qty", name: wn._("Planned Qty"),
|
|
||||||
field: "planned_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "requested_qty", name: wn._("Requested Qty"),
|
|
||||||
field: "requested_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "ordered_qty", name: wn._("Ordered Qty"),
|
|
||||||
field: "ordered_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "reserved_qty", name: wn._("Reserved Qty"),
|
|
||||||
field: "reserved_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "projected_qty", name: wn._("Projected Qty"),
|
|
||||||
field: "projected_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "re_order_level", name: wn._("Re-Order Level"),
|
|
||||||
field: "re_order_level", width: 80, formatter: this.currency_formatter},
|
|
||||||
{id: "re_order_qty", name: wn._("Re-Order Qty"),
|
|
||||||
field: "re_order_qty", width: 80, formatter: this.currency_formatter},
|
|
||||||
];
|
|
||||||
},
|
|
||||||
|
|
||||||
filters: [
|
|
||||||
{fieldtype:"Link", label: wn._("Item Code"), link:"Item", default_value: "Select Item...",
|
|
||||||
filter: function(val, item, opts) {
|
|
||||||
return item.item_code == val || !val;
|
|
||||||
}},
|
|
||||||
|
|
||||||
{fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
|
|
||||||
default_value: "Select Warehouse...", filter: function(val, item, opts) {
|
|
||||||
return item.warehouse == val || val == opts.default_value;
|
|
||||||
}},
|
|
||||||
|
|
||||||
{fieldtype:"Select", label: wn._("Brand"), link:"Brand",
|
|
||||||
default_value: "Select Brand...", filter: function(val, item, opts) {
|
|
||||||
return val == opts.default_value || item.brand == val;
|
|
||||||
}},
|
|
||||||
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
|
|
||||||
{fieldtype:"Button", label: wn._("Reset Filters")}
|
|
||||||
],
|
|
||||||
|
|
||||||
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(wn.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(wn.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]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"creation": "2012-12-31 10:52:14",
|
|
||||||
"docstatus": 0,
|
|
||||||
"modified": "2013-07-11 14:44:21",
|
|
||||||
"modified_by": "Administrator",
|
|
||||||
"owner": "Administrator"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"icon": "icon-table",
|
|
||||||
"module": "Stock",
|
|
||||||
"name": "__common__",
|
|
||||||
"page_name": "stock-level",
|
|
||||||
"standard": "Yes",
|
|
||||||
"title": "Stock Level"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"name": "__common__",
|
|
||||||
"parent": "stock-level",
|
|
||||||
"parentfield": "roles",
|
|
||||||
"parenttype": "Page"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page",
|
|
||||||
"name": "stock-level"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Material Manager"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"doctype": "Page Role",
|
|
||||||
"role": "Analytics"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
40
stock/report/stock_ageing/stock_ageing.js
Normal file
40
stock/report/stock_ageing/stock_ageing.js
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
// License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
wn.query_reports["Stock Ageing"] = {
|
||||||
|
"filters": [
|
||||||
|
{
|
||||||
|
"fieldname":"company",
|
||||||
|
"label": wn._("Company"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Company",
|
||||||
|
"default": wn.defaults.get_user_default("company"),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"to_date",
|
||||||
|
"label": wn._("To Date"),
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"default": wn.datetime.get_today(),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"warehouse",
|
||||||
|
"label": wn._("Warehouse"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Warehouse"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"item_code",
|
||||||
|
"label": wn._("Item"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"brand",
|
||||||
|
"label": wn._("Brand"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Brand"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
94
stock/report/stock_ageing/stock_ageing.py
Normal file
94
stock/report/stock_ageing/stock_ageing.py
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
import webnotes
|
||||||
|
from webnotes.utils import date_diff
|
||||||
|
|
||||||
|
def execute(filters=None):
|
||||||
|
|
||||||
|
columns = get_columns()
|
||||||
|
item_details = get_fifo_queue(filters)
|
||||||
|
to_date = filters["to_date"]
|
||||||
|
data = []
|
||||||
|
for item, item_dict in item_details.items():
|
||||||
|
fifo_queue = item_dict["fifo_queue"]
|
||||||
|
details = item_dict["details"]
|
||||||
|
if not fifo_queue: continue
|
||||||
|
|
||||||
|
average_age = get_average_age(fifo_queue, to_date)
|
||||||
|
earliest_age = date_diff(to_date, fifo_queue[0][1])
|
||||||
|
latest_age = date_diff(to_date, fifo_queue[-1][1])
|
||||||
|
|
||||||
|
data.append([item, details.item_name, details.description, details.item_group,
|
||||||
|
details.brand, average_age, earliest_age, latest_age, details.stock_uom])
|
||||||
|
|
||||||
|
return columns, data
|
||||||
|
|
||||||
|
def get_average_age(fifo_queue, to_date):
|
||||||
|
batch_age = age_qty = total_qty = 0.0
|
||||||
|
for batch in fifo_queue:
|
||||||
|
batch_age = date_diff(to_date, batch[1])
|
||||||
|
age_qty += batch_age * batch[0]
|
||||||
|
total_qty += batch[0]
|
||||||
|
|
||||||
|
return (age_qty / total_qty) if total_qty else 0.0
|
||||||
|
|
||||||
|
def get_columns():
|
||||||
|
return ["Item Code:Link/Item:100", "Item Name::100", "Description::200",
|
||||||
|
"Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Average Age:Float:100",
|
||||||
|
"Earliest:Int:80", "Latest:Int:80", "UOM:Link/UOM:100"]
|
||||||
|
|
||||||
|
def get_fifo_queue(filters):
|
||||||
|
item_details = {}
|
||||||
|
for d in get_stock_ledger_entries(filters):
|
||||||
|
item_details.setdefault(d.name, {"details": d, "fifo_queue": []})
|
||||||
|
fifo_queue = item_details[d.name]["fifo_queue"]
|
||||||
|
if d.actual_qty > 0:
|
||||||
|
fifo_queue.append([d.actual_qty, d.posting_date])
|
||||||
|
else:
|
||||||
|
qty_to_pop = abs(d.actual_qty)
|
||||||
|
while qty_to_pop:
|
||||||
|
batch = fifo_queue[0] if fifo_queue else [0, None]
|
||||||
|
if 0 < batch[0] <= qty_to_pop:
|
||||||
|
# if batch qty > 0
|
||||||
|
# not enough or exactly same qty in current batch, clear batch
|
||||||
|
qty_to_pop -= batch[0]
|
||||||
|
fifo_queue.pop(0)
|
||||||
|
else:
|
||||||
|
# all from current batch
|
||||||
|
batch[0] -= qty_to_pop
|
||||||
|
qty_to_pop = 0
|
||||||
|
|
||||||
|
return item_details
|
||||||
|
|
||||||
|
def get_stock_ledger_entries(filters):
|
||||||
|
return webnotes.conn.sql("""select
|
||||||
|
item.name, item.item_name, item_group, brand, description, item.stock_uom,
|
||||||
|
actual_qty, posting_date
|
||||||
|
from `tabStock Ledger Entry` sle,
|
||||||
|
(select name, item_name, description, stock_uom, brand
|
||||||
|
from `tabItem` {item_conditions}) item
|
||||||
|
where item_code = item.name and
|
||||||
|
company = %(company)s and
|
||||||
|
posting_date <= %(to_date)s
|
||||||
|
{sle_conditions}
|
||||||
|
order by posting_date, posting_time, sle.name"""\
|
||||||
|
.format(item_conditions=get_item_conditions(filters),
|
||||||
|
sle_conditions=get_sle_conditions(filters)), filters, as_dict=True)
|
||||||
|
|
||||||
|
def get_item_conditions(filters):
|
||||||
|
conditions = []
|
||||||
|
if filters.get("item_code"):
|
||||||
|
conditions.append("item_code=%(item_code)s")
|
||||||
|
if filters.get("brand"):
|
||||||
|
conditions.append("brand=%(brand)s")
|
||||||
|
|
||||||
|
return "where {}".format(" and ".join(conditions)) if conditions else ""
|
||||||
|
|
||||||
|
def get_sle_conditions(filters):
|
||||||
|
conditions = []
|
||||||
|
if filters.get("warehouse"):
|
||||||
|
conditions.append("warehouse=%(warehouse)s")
|
||||||
|
|
||||||
|
return "and {}".format(" and ".join(conditions)) if conditions else ""
|
||||||
21
stock/report/stock_ageing/stock_ageing.txt
Normal file
21
stock/report/stock_ageing/stock_ageing.txt
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"creation": "2013-12-02 17:09:31",
|
||||||
|
"docstatus": 0,
|
||||||
|
"modified": "2013-12-02 17:09:31",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"owner": "Administrator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"doctype": "Report",
|
||||||
|
"is_standard": "Yes",
|
||||||
|
"name": "__common__",
|
||||||
|
"ref_doctype": "Item",
|
||||||
|
"report_name": "Stock Ageing",
|
||||||
|
"report_type": "Script Report"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"doctype": "Report",
|
||||||
|
"name": "Stock Ageing"
|
||||||
|
}
|
||||||
|
]
|
||||||
0
stock/report/stock_projected_qty/__init__.py
Normal file
0
stock/report/stock_projected_qty/__init__.py
Normal file
33
stock/report/stock_projected_qty/stock_projected_qty.js
Normal file
33
stock/report/stock_projected_qty/stock_projected_qty.js
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
// License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
wn.query_reports["Stock Projected Qty"] = {
|
||||||
|
"filters": [
|
||||||
|
{
|
||||||
|
"fieldname":"company",
|
||||||
|
"label": wn._("Company"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Company",
|
||||||
|
"default": wn.defaults.get_user_default("company"),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"warehouse",
|
||||||
|
"label": wn._("Warehouse"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Warehouse"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"item_code",
|
||||||
|
"label": wn._("Item"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"brand",
|
||||||
|
"label": wn._("Brand"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Brand"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
44
stock/report/stock_projected_qty/stock_projected_qty.py
Normal file
44
stock/report/stock_projected_qty/stock_projected_qty.py
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||||
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
import webnotes
|
||||||
|
|
||||||
|
def execute(filters=None):
|
||||||
|
columns = get_columns()
|
||||||
|
|
||||||
|
data = webnotes.conn.sql("""select
|
||||||
|
item.name, item.item_name, description, item_group, brand, warehouse, item.stock_uom,
|
||||||
|
actual_qty, planned_qty, indented_qty, ordered_qty, reserved_qty,
|
||||||
|
projected_qty, item.re_order_level, item.re_order_qty
|
||||||
|
from `tabBin` bin,
|
||||||
|
(select name, company from tabWarehouse
|
||||||
|
where company=%(company)s {warehouse_conditions}) wh,
|
||||||
|
(select name, item_name, description, stock_uom, item_group,
|
||||||
|
brand, re_order_level, re_order_qty
|
||||||
|
from `tabItem` {item_conditions}) item
|
||||||
|
where item_code = item.name and warehouse = wh.name
|
||||||
|
order by item.name, wh.name"""\
|
||||||
|
.format(item_conditions=get_item_conditions(filters),
|
||||||
|
warehouse_conditions=get_warehouse_conditions(filters)), filters, debug=1)
|
||||||
|
|
||||||
|
return columns, data
|
||||||
|
|
||||||
|
def get_columns():
|
||||||
|
return ["Item Code:Link/Item:140", "Item Name::100", "Description::200",
|
||||||
|
"Brand:Link/Brand:100", "Warehouse:Link/Warehouse:120", "UOM:Link/UOM:100",
|
||||||
|
"Actual Qty:Float:100", "Planned Qty:Float:100", "Requested Qty:Float:110",
|
||||||
|
"Ordered Qty:Float:100", "Reserved Qty:Float:100", "Projected Qty:Float:100",
|
||||||
|
"Reorder Level:Float:100", "Reorder Qty:Float:100"]
|
||||||
|
|
||||||
|
def get_item_conditions(filters):
|
||||||
|
conditions = []
|
||||||
|
if filters.get("item_code"):
|
||||||
|
conditions.append("name=%(item_code)s")
|
||||||
|
if filters.get("brand"):
|
||||||
|
conditions.append("brand=%(brand)s")
|
||||||
|
|
||||||
|
return "where {}".format(" and ".join(conditions)) if conditions else ""
|
||||||
|
|
||||||
|
def get_warehouse_conditions(filters):
|
||||||
|
return " and name=%(warehouse)s" if filters.get("warehouse") else ""
|
||||||
22
stock/report/stock_projected_qty/stock_projected_qty.txt
Normal file
22
stock/report/stock_projected_qty/stock_projected_qty.txt
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"creation": "2013-12-04 18:21:56",
|
||||||
|
"docstatus": 0,
|
||||||
|
"modified": "2013-12-04 18:21:56",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"owner": "Administrator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"add_total_row": 1,
|
||||||
|
"doctype": "Report",
|
||||||
|
"is_standard": "Yes",
|
||||||
|
"name": "__common__",
|
||||||
|
"ref_doctype": "Item",
|
||||||
|
"report_name": "Stock Projected Qty",
|
||||||
|
"report_type": "Script Report"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"doctype": "Report",
|
||||||
|
"name": "Stock Projected Qty"
|
||||||
|
}
|
||||||
|
]
|
||||||
Loading…
x
Reference in New Issue
Block a user