nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[docs] fixes #5697

Browse Source
This commit is contained in:
Rushabh Mehta
2016-07-14 16:59:58 +05:30
parent 92d1b8cc6d
commit 528e145a54
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
View File

@@ -2,7 +2,8 @@
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() { 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({ frappe.query_reports["Profit and Loss Statement"]["filters"].push({
"fieldname": "accumulated_values", "fieldname": "accumulated_values",

2
erpnext/docs/license.html
View File

@@ -13,7 +13,7 @@ ERPNext is a trademark of Frappe Technologies</p>
<p>Version 3, 29 June 2007</p> <p>Version 3, 29 June 2007</p>
<p>http://www.gnu.org/copyleft/gpl.html</p> <p><a href="http://www.gnu.org/copyleft/gpl.html" rel="nofollow">http://www.gnu.org/copyleft/gpl.html</a></p>
<p>TERMS AND CONDITIONS <p>TERMS AND CONDITIONS
0. Definitions.</p> 0. Definitions.</p>

0
erpnext/docs/user/manual/de/Beispiel/Beispiel.md → erpnext/docs/user/manual/de/Beispiel/index.md
View File

4
erpnext/stock/page/stock_balance/stock_balance.json
View File

@@ -4,7 +4,7 @@
"docstatus": 0, "docstatus": 0,
"doctype": "Page", "doctype": "Page",
"idx": 0, "idx": 0,
"modified": "2016-04-21 05:04:30.228526", "modified": "2016-07-14 06:39:09.096256",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "stock-balance", "name": "stock-balance",
@@ -18,5 +18,5 @@
"script": null, "script": null,
"standard": "Yes", "standard": "Yes",
"style": null, "style": null,
"title": "Stock Balance" "title": "Stock Summary"
} }

5
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -8,7 +8,7 @@ from frappe.utils import flt, getdate
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
validate_filters(filters) validate_filters(filters)
columns = get_columns() columns = get_columns()
@@ -83,7 +83,7 @@ def get_stock_ledger_entries(filters):
company, voucher_type, qty_after_transaction, stock_value_difference company, voucher_type, qty_after_transaction, stock_value_difference
from `tabStock Ledger Entry` sle force index (posting_sort_index) from `tabStock Ledger Entry` sle force index (posting_sort_index)
where docstatus < 2 %s order by posting_date, posting_time, name""" % 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): def get_item_warehouse_map(filters):
iwb_map = {} 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]) sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0])
if sle_count > 500000: if sle_count > 500000:
frappe.throw(_("Please set filter based on Item or Warehouse")) frappe.throw(_("Please set filter based on Item or Warehouse"))