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

Merge branch 'master' into edge

Browse Source 
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
This commit is contained in:
Anand Doshi
2013-04-16 21:32:06 +05:30
parent edfeade5a6 aa7a386db9
commit c6aecb3f97
22 changed files with 465 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
selling/doctype/sales_common/sales_common.py
View File

@@ -125,8 +125,7 @@ class DocType(TransactionBase):
def get_item_details(self, args, obj):
import json
if not obj.doc.price_list_name:
msgprint("Please Select Price List before selecting Items")
raise Exception
msgprint("Please Select Price List before selecting Items", raise_exception=True)
item = webnotes.conn.sql("""select description, item_name, brand, item_group, stock_uom,
default_warehouse, default_income_account, default_sales_cost_center,
purchase_account, description_html, barcode from `tabItem`

5
selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.js
View File

@@ -39,10 +39,7 @@ report.get_query = function() {
sp = this.get_filter('Sales Person', 'Sales Person').get_value();
date_fld = 'transaction_date';
if(based_on == 'Sales Invoice') {
based_on = 'Sales Invoice';
date_fld = 'posting_date';
}
if(based_on == 'Sales Invoice' || based_on == "Delivery Note") date_fld = 'posting_date';
sp_cond = '';
if (from_date) sp_cond += ' AND t1.' + date_fld + '>= "' + from_date + '"';