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

[minor] added make material request from Stock Entry and removed cur_frm

Browse Source
This commit is contained in:
Rushabh Mehta
2017-02-09 17:47:22 +05:30
parent 2b5fa7647a
commit e6aa3b435a
3 changed files with 223 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@@ -9,12 +9,12 @@ from erpnext.accounts.report.financial_statements import (get_period_list, get_c
def execute(filters=None):
period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity)
income = get_data(filters.company, "Income", "Credit", period_list, filters = filters,
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
expense = get_data(filters.company, "Expense", "Debit", period_list, filters=filters,
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
data = []
@@ -24,7 +24,7 @@ def execute(filters=None):
data.append(net_profit_loss)
columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
return columns, data, None, chart
@@ -43,21 +43,21 @@ def get_net_profit_loss(income, expense, period_list, company):
for period in period_list:
net_profit_loss[period.key] = flt(income[-2][period.key] - expense[-2][period.key], 3)
if net_profit_loss[period.key]:
has_value=True
total += flt(net_profit_loss[period.key])
net_profit_loss["total"] = total
if has_value:
return net_profit_loss
def get_chart_data(filters, columns, income, expense, net_profit_loss):
x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
income_data, expense_data, net_profit = [], [], []
for p in columns[2:]:
if income:
income_data.append(income[-2].get(p.get("fieldname")))
@@ -65,7 +65,7 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
expense_data.append(expense[-2].get(p.get("fieldname")))
if net_profit_loss:
net_profit.append(net_profit_loss.get(p.get("fieldname")))
columns = [x_intervals]
if income_data:
columns.append(["Income"] + income_data)
@@ -73,15 +73,20 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
columns.append(["Expense"] + expense_data)
if net_profit:
columns.append(["Net Profit/Loss"] + net_profit)
chart = {
"data": {
'x': 'x',
'columns': columns
'columns': columns,
'colors': {
'Income': '#5E64FF',
'Expense': '#b8c2cc',
'Net Profit/Loss': '#ff5858'
}
}
}
if not filters.accumulated_values:
chart["chart_type"] = "bar"
return chart