nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge conflict]

Browse Source
This commit is contained in:
Nabin Hait
2013-06-05 12:37:10 +05:30
parent aec5553814 713c18336f
commit 90202aec2b
220 changed files with 4854 additions and 5516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ def get_source_data(filters):
timestamp(si.posting_date, si.posting_time) as posting_datetime
from `tabSales Invoice` si, `tabSales Invoice Item` item
where item.parent = si.name and si.docstatus = 1 %s
and si.is_pos = 1 and si.update_stock = 1
and si.update_stock = 1
order by si.posting_date desc, si.posting_time desc""" % (conditions,), filters, as_dict=1)
source = delivery_note_items + sales_invoice_items