From 528e145a546483fe774cd7a7a0b8f7d620a8e4a0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Jul 2016 16:59:58 +0530 Subject: [PATCH] [docs] fixes #5697 --- .../profit_and_loss_statement/profit_and_loss_statement.js | 3 ++- erpnext/docs/license.html | 2 +- .../docs/user/manual/de/Beispiel/{Beispiel.md => index.md} | 0 erpnext/stock/page/stock_balance/stock_balance.json | 4 ++-- erpnext/stock/report/stock_balance/stock_balance.py | 5 ++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename erpnext/docs/user/manual/de/Beispiel/{Beispiel.md => index.md} (100%) diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js index 91ec9d93ca..0f7a6b6ef3 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js @@ -2,7 +2,8 @@ // License: GNU General Public License v3. See license.txt frappe.require("assets/erpnext/js/financial_statements.js", function() { - frappe.query_reports["Profit and Loss Statement"] = $.extend({}, erpnext.financial_statements); + frappe.query_reports["Profit and Loss Statement"] = $.extend({}, + erpnext.financial_statements); frappe.query_reports["Profit and Loss Statement"]["filters"].push({ "fieldname": "accumulated_values", diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html index b0310f64f2..6aa4e645b3 100644 --- a/erpnext/docs/license.html +++ b/erpnext/docs/license.html @@ -13,7 +13,7 @@ ERPNext is a trademark of Frappe Technologies

Version 3, 29 June 2007

-

http://www.gnu.org/copyleft/gpl.html

+

http://www.gnu.org/copyleft/gpl.html

TERMS AND CONDITIONS 0. Definitions.

diff --git a/erpnext/docs/user/manual/de/Beispiel/Beispiel.md b/erpnext/docs/user/manual/de/Beispiel/index.md similarity index 100% rename from erpnext/docs/user/manual/de/Beispiel/Beispiel.md rename to erpnext/docs/user/manual/de/Beispiel/index.md diff --git a/erpnext/stock/page/stock_balance/stock_balance.json b/erpnext/stock/page/stock_balance/stock_balance.json index d908875edb..05039daa59 100644 --- a/erpnext/stock/page/stock_balance/stock_balance.json +++ b/erpnext/stock/page/stock_balance/stock_balance.json @@ -4,7 +4,7 @@ "docstatus": 0, "doctype": "Page", "idx": 0, - "modified": "2016-04-21 05:04:30.228526", + "modified": "2016-07-14 06:39:09.096256", "modified_by": "Administrator", "module": "Stock", "name": "stock-balance", @@ -18,5 +18,5 @@ "script": null, "standard": "Yes", "style": null, - "title": "Stock Balance" + "title": "Stock Summary" } \ No newline at end of file diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 696f2b0059..2777d3d216 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -8,7 +8,7 @@ from frappe.utils import flt, getdate def execute(filters=None): if not filters: filters = {} - + validate_filters(filters) columns = get_columns() @@ -83,7 +83,7 @@ def get_stock_ledger_entries(filters): company, voucher_type, qty_after_transaction, stock_value_difference from `tabStock Ledger Entry` sle force index (posting_sort_index) where docstatus < 2 %s order by posting_date, posting_time, name""" % - conditions, as_dict=1, debug=1) + conditions, as_dict=1) def get_item_warehouse_map(filters): iwb_map = {} @@ -147,4 +147,3 @@ def validate_filters(filters): sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0]) if sle_count > 500000: frappe.throw(_("Please set filter based on Item or Warehouse")) - \ No newline at end of file