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

Merge pull request #2201 from nabinhait/hotfix

Browse Source 
Columns added in report and fixes in customer's account creation
This commit is contained in:
Anand Doshi 2014-09-16 15:18:31 +05:30
commit 27c7226d97
3 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/party.py
View File

@ -163,7 +163,7 @@ def create_party_account(party, party_type, company):
company_details = frappe.db.get_value("Company", company, company_details = frappe.db.get_value("Company", company,
["abbr", "receivables_group", "payables_group"], as_dict=True) ["abbr", "receivables_group", "payables_group"], as_dict=True)
if not frappe.db.exists("Account", (party + " - " + company_details.abbr)): if not frappe.db.exists("Account", (party.strip() + " - " + company_details.abbr)):
parent_account = company_details.receivables_group \ parent_account = company_details.receivables_group \
if party_type=="Customer" else company_details.payables_group if party_type=="Customer" else company_details.payables_group
if not parent_account: if not parent_account:

6
erpnext/config/buying.py
View File

@ -135,12 +135,6 @@ def get_data():
"name": "Item-wise Purchase History", "name": "Item-wise Purchase History",
"doctype": "Item" "doctype": "Item"
}, },
{
"type": "report",
"is_query_report": True,
"name": "Item-wise Last Purchase Rate",
"doctype": "Item"
},
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,

68
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
View File

@ -7,34 +7,43 @@ from frappe import msgprint, _
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
columns = get_columns(filters) columns = get_columns(filters)
data = get_entries(filters) entries = get_entries(filters)
item_details = get_item_details()
data = []
for d in entries:
data.append([
d.name, d.customer, d.territory, d.posting_date, d.item_code,
item_details.get(d.item_code, {}).get("item_group"), item_details.get(d.item_code, {}).get("brand"),
d.qty, d.base_amount, d.sales_person, d.allocated_percentage, d.contribution_amt
])
return columns, data return columns, data
def get_columns(filters): def get_columns(filters):
if not filters.get("doc_type"): if not filters.get("doc_type"):
msgprint(_("Please select the document type first"), raise_exception=1) msgprint(_("Please select the document type first"), raise_exception=1)
return [filters["doc_type"] + ":Link/" + filters["doc_type"] + ":140", return [filters["doc_type"] + ":Link/" + filters["doc_type"] + ":140",
_("Customer") + ":Link/Customer:140", _("Territory") + ":Link/Territory:100", _("Posting Date") + ":Date:100", _("Customer") + ":Link/Customer:140", _("Territory") + ":Link/Territory:100", _("Posting Date") + ":Date:100",
_("Item Code") + ":Link/Item:120", _("Qty") + ":Float:100", _("Amount") + ":Currency:120", _("Item Code") + ":Link/Item:120", _("Item Group") + ":Link/Item Group:120",
_("Sales Person") + ":Link/Sales Person:140", _("Contribution %") + ":Float:110", _("Brand") + ":Link/Brand:120", _("Qty") + ":Float:100", _("Amount") + ":Currency:120",
_("Sales Person") + ":Link/Sales Person:140", _("Contribution %") + ":Float:110",
_("Contribution Amount") + ":Currency:140"] _("Contribution Amount") + ":Currency:140"]
def get_entries(filters): def get_entries(filters):
date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date" date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date"
conditions, items = get_conditions(filters, date_field) conditions, items = get_conditions(filters, date_field)
entries = frappe.db.sql("""select dt.name, dt.customer, dt.territory, dt.%s, entries = frappe.db.sql("""select dt.name, dt.customer, dt.territory, dt.%s as posting_date,
dt_item.item_code, dt_item.qty, dt_item.base_amount, st.sales_person, dt_item.item_code, dt_item.qty, dt_item.base_amount, st.sales_person,
st.allocated_percentage, dt_item.base_amount*st.allocated_percentage/100 st.allocated_percentage, dt_item.base_amount*st.allocated_percentage/100 as contribution_amt
from `tab%s` dt, `tab%s Item` dt_item, `tabSales Team` st from `tab%s` dt, `tab%s Item` dt_item, `tabSales Team` st
where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s
and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" % and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" %
(date_field, filters["doc_type"], filters["doc_type"], '%s', conditions), (date_field, filters["doc_type"], filters["doc_type"], '%s', conditions),
tuple([filters["doc_type"]] + items), as_list=1) tuple([filters["doc_type"]] + items), as_dict=1)
return entries return entries
def get_conditions(filters, date_field): def get_conditions(filters, date_field):
@ -45,18 +54,18 @@ def get_conditions(filters, date_field):
filters["customer"].replace("'", "\'") filters["customer"].replace("'", "\'")
if filters.get("territory"): conditions += " and dt.territory = '%s'" % \ if filters.get("territory"): conditions += " and dt.territory = '%s'" % \
filters["territory"].replace("'", "\'") filters["territory"].replace("'", "\'")
if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \ if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \
(date_field, filters["from_date"]) (date_field, filters["from_date"])
if filters.get("to_date"): conditions += " and dt.%s <= '%s'" % (date_field, filters["to_date"]) if filters.get("to_date"): conditions += " and dt.%s <= '%s'" % (date_field, filters["to_date"])
if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \ if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \
filters["sales_person"].replace("'", "\'") filters["sales_person"].replace("'", "\'")
items = get_items(filters) items = get_items(filters)
if items: if items:
conditions += " and dt_item.item_code in (%s)" % ', '.join(['%s']*len(items)) conditions += " and dt_item.item_code in (%s)" % ', '.join(['%s']*len(items))
return conditions, items return conditions, items
def get_items(filters): def get_items(filters):
@ -66,7 +75,14 @@ def get_items(filters):
items = [] items = []
if key: if key:
items = frappe.db.sql_list("""select name from tabItem where %s = %s""" % items = frappe.db.sql_list("""select name from tabItem where %s = %s""" %
(key, '%s'), (filters[key])) (key, '%s'), (filters[key]))
return items return items
def get_item_details():
item_details = {}
for d in frappe.db.sql("""select name, item_group, brand from `tabItem`""", as_dict=1):
item_details.setdefault(d.name, d)
return item_details