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

Merge branch 'master' of https://github.com/webnotes/erpnext

Browse Source
This commit is contained in:
Saurabh
2013-06-14 16:48:41 +05:30
parent 1848b71a0a 0865f60673
commit 606d8383ff
19 changed files with 218 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ def get_conditions(filters):
def get_items(filters):
conditions = get_conditions(filters)
return webnotes.conn.sql("""select si.name, si.posting_date, si.debit_to, si.project_name,
si.customer, si.remarks, si.territory, si_item.item_code, si_item.item_name,
si.customer, si.remarks, si.territory, si.company, si_item.item_code, si_item.item_name,
si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account,
si_item.qty, si_item.basic_rate, si_item.amount
from `tabSales Invoice` si, `tabSales Invoice Item` si_item