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

Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n

Browse Source 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
This commit is contained in:
Bárbara Perretti
2013-10-16 15:09:18 -03:00
parent 3da50f0960 f146e8b7f5
commit 4b41e5f7f7
250 changed files with 5061 additions and 2506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/report/gross_profit/gross_profit.py
View File

@@ -55,7 +55,7 @@ def get_stock_ledger_entries(filters):
from `tabStock Ledger Entry`"""
if filters.get("company"):
query += """ and company=%(company)s"""
query += """ where company=%(company)s"""
query += " order by item_code desc, warehouse desc, posting_date desc, posting_time desc, name desc"