Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] [minor] add customer_name/supplier_name in sales/purchase register

Browse Source
This commit is contained in:
Nabin Hait 2013-07-12 17:50:34 +05:30
parent c81236770f
commit 8faa90fb20
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -26,9 +26,9 @@ def execute(filters=None):
data = [] data = []
for d in item_list: for d in item_list:
expense_head = d.expense_head or aii_account_map.get(d.company) expense_head = d.expense_head or aii_account_map.get(d.company)
data.append([d.item_code, d.item_name, d.item_group, d.name, d.posting_date, d.supplier, data.append([d.item_code, d.item_name, d.item_group, d.name, d.posting_date,
d.credit_to, d.project_name, d.company, d.purchase_order, d.purchase_receipt, d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order,
expense_head, d.qty, d.rate, d.amount]) d.purchase_receipt, expense_head, d.qty, d.rate, d.amount])
return columns, data return columns, data
@ -59,7 +59,7 @@ def get_items(filters):
return webnotes.conn.sql("""select pi.name, pi.posting_date, pi.credit_to, pi.company, return webnotes.conn.sql("""select pi.name, pi.posting_date, pi.credit_to, pi.company,
pi.supplier, pi.remarks, pi_item.item_code, pi_item.item_name, pi_item.item_group, pi.supplier, pi.remarks, pi_item.item_code, pi_item.item_name, pi_item.item_group,
pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt, pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt,
pi_item.expense_head, pi_item.qty, pi_item.rate, pi_item.amount pi_item.expense_head, pi_item.qty, pi_item.rate, pi_item.amount, pi.supplier_name
from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
where pi.name = pi_item.parent and pi.docstatus = 1 %s where pi.name = pi_item.parent and pi.docstatus = 1 %s
order by pi.posting_date desc, pi_item.item_code desc""" % conditions, filters, as_dict=1) order by pi.posting_date desc, pi_item.item_code desc""" % conditions, filters, as_dict=1)

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

@ -16,7 +16,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
from webnotes.utils import flt
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
@ -26,9 +25,9 @@ def execute(filters=None):
data = [] data = []
for d in item_list: for d in item_list:
data.append([d.item_code, d.item_name, d.item_group, d.name, d.posting_date, d.customer, data.append([d.item_code, d.item_name, d.item_group, d.name, d.posting_date,
d.debit_to, d.territory, d.project_name, d.company, d.sales_order, d.delivery_note, d.customer_name, d.debit_to, d.territory, d.project_name, d.company, d.sales_order,
d.income_account, d.qty, d.basic_rate, d.amount]) d.delivery_note, d.income_account, d.qty, d.basic_rate, d.amount])
return columns, data return columns, data
@ -61,7 +60,7 @@ def get_items(filters):
return webnotes.conn.sql("""select si.name, si.posting_date, si.debit_to, si.project_name, return webnotes.conn.sql("""select si.name, si.posting_date, si.debit_to, si.project_name,
si.customer, si.remarks, si.territory, si.company, 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.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account,
si_item.qty, si_item.basic_rate, si_item.amount si_item.qty, si_item.basic_rate, si_item.amount, si.customer_name
from `tabSales Invoice` si, `tabSales Invoice Item` si_item from `tabSales Invoice` si, `tabSales Invoice Item` si_item
where si.name = si_item.parent and si.docstatus = 1 %s where si.name = si_item.parent and si.docstatus = 1 %s
order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1) order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1)

9
accounts/report/purchase_register/purchase_register.py
View File

@ -42,7 +42,7 @@ def execute(filters=None):
purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", []))) purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", []))) project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
row = [inv.name, inv.posting_date, inv.supplier, inv.credit_to, row = [inv.name, inv.posting_date, inv.supplier_name, inv.credit_to,
account_map.get(inv.credit_to), ", ".join(project_name), inv.bill_no, inv.bill_date, account_map.get(inv.credit_to), ", ".join(project_name), inv.bill_no, inv.bill_date,
inv.remarks, ", ".join(purchase_order), ", ".join(purchase_receipt)] inv.remarks, ", ".join(purchase_order), ", ".join(purchase_receipt)]
@ -68,7 +68,7 @@ def execute(filters=None):
def get_columns(invoice_list): def get_columns(invoice_list):
"""return columns based on filters""" """return columns based on filters"""
columns = [ columns = [
"Invoice:Link/Purchase Invoice:120", "Posting Date:Date:80", "Supplier:Link/Supplier:120", "Invoice:Link/Purchase Invoice:120", "Posting Date:Date:80", "Supplier::120",
"Supplier Account:Link/Account:120", "Account Group:LInk/Account:120", "Supplier Account:Link/Account:120", "Account Group:LInk/Account:120",
"Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150", "Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150",
"Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100" "Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100"
@ -118,9 +118,8 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return webnotes.conn.sql("""select name, posting_date, credit_to, return webnotes.conn.sql("""select name, posting_date, credit_to, supplier, supplier_name,
supplier, bill_no, bill_date, remarks, net_total, bill_no, bill_date, remarks, net_total, total_tax, grand_total, outstanding_amount
total_tax, grand_total, outstanding_amount
from `tabPurchase Invoice` where docstatus = 1 %s from `tabPurchase Invoice` where docstatus = 1 %s
order by posting_date desc, name desc""" % conditions, filters, as_dict=1) order by posting_date desc, name desc""" % conditions, filters, as_dict=1)

6
accounts/report/sales_register/sales_register.py
View File

@ -42,7 +42,7 @@ def execute(filters=None):
sales_order = list(set(invoice_so_dn_map.get(inv.name, {}).get("sales_order", []))) sales_order = list(set(invoice_so_dn_map.get(inv.name, {}).get("sales_order", [])))
delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", []))) delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])))
row = [inv.name, inv.posting_date, inv.customer, inv.debit_to, row = [inv.name, inv.posting_date, inv.customer_name, inv.debit_to,
account_map.get(inv.debit_to), customer_map.get(inv.customer), inv.project_name, account_map.get(inv.debit_to), customer_map.get(inv.customer), inv.project_name,
inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)] inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)]
@ -68,7 +68,7 @@ def execute(filters=None):
def get_columns(invoice_list): def get_columns(invoice_list):
"""return columns based on filters""" """return columns based on filters"""
columns = [ columns = [
"Invoice:Link/Sales Invoice:120", "Posting Date:Date:80", "Customer:Link/Customer:120", "Invoice:Link/Sales Invoice:120", "Posting Date:Date:80", "Customer::120",
"Customer Account:Link/Account:120", "Account Group:LInk/Account:120", "Customer Account:Link/Account:120", "Account Group:LInk/Account:120",
"Territory:Link/Territory:80", "Project:Link/Project:80", "Territory:Link/Territory:80", "Project:Link/Project:80",
"Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100" "Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100"
@ -118,7 +118,7 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer, return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer,
remarks, net_total, other_charges_total, grand_total, rounded_total, customer_name, remarks, net_total, other_charges_total, grand_total, rounded_total,
outstanding_amount from `tabSales Invoice` outstanding_amount from `tabSales Invoice`
where docstatus = 1 %s order by posting_date desc, name desc""" % where docstatus = 1 %s order by posting_date desc, name desc""" %
conditions, filters, as_dict=1) conditions, filters, as_dict=1)