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

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

Browse Source
This commit is contained in:
Nabin Hait
2012-10-04 18:35:47 +05:30
parent 3e32040ae0 cdba51c5a9
commit 760955fc68
36 changed files with 537 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selling/doctype/lead/lead.py
View File

@@ -67,7 +67,6 @@ class DocType:
return ret
def validate(self):
import string
if self.doc.status == 'Lead Lost' and not self.doc.order_lost_reason:
msgprint("Please Enter Lost Reason under More Info section")
raise Exception
@@ -80,7 +79,6 @@ class DocType:
if not validate_email_add(self.doc.email_id):
msgprint('Please enter valid email id.')
raise Exception
def on_update(self):
if self.doc.contact_date:

5
selling/doctype/lead/lead_list.js
View File

@@ -4,7 +4,8 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
this.fields = this.fields.concat([
'tabLead.lead_name',
'tabLead.status',
'tabLead.source'
'tabLead.source',
'tabLead.modified_by'
]);
this.stats = this.stats.concat(['status', 'source', 'rating', 'company']);
},
@@ -25,7 +26,7 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
columns: [
{width: '3%', content: 'check'},
{width: '5%', content:'avatar'},
{width: '5%', content:'avatar_modified'},
{width: '30%', content:'lead_name'},
{width: '12%', content:'status_html'},
{width: '38%', content:'lead_status+tags', css: {color:'#222'}},

2
selling/page/sales_analytics/sales_analytics.js
View File

@@ -23,6 +23,8 @@ wn.pages['sales-analytics'].onload = function(wrapper) {
new erpnext.SalesAnalytics(wrapper);
}
wn.require("lib/js/wn/views/grid_report.js");
erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
init: function(wrapper) {
this._super({

31
selling/page/sales_analytics/sales_analytics.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
u'creation': '2012-09-21 12:06:14',
u'creation': '2012-09-21 20:15:12',
u'docstatus': 0,
u'modified': '2012-09-21 12:06:14',
u'modified': '2012-10-04 17:17:39',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@@ -20,9 +20,36 @@
'title': u'Sales Analytics'
},
# These values are common for all Page Role
{
u'doctype': u'Page Role',
u'name': u'__common__',
'parent': u'sales-analytics',
'parentfield': u'roles',
'parenttype': u'Page'
},
# Page, sales-analytics
{
u'doctype': u'Page',
u'name': u'sales-analytics'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Analytics'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Sales Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Maintenance Manager'
}
]

74
selling/page/sales_browser/sales_browser.txt
View File

@@ -3,49 +3,77 @@
# These values are common in all dictionaries
{
'creation': '2010-12-14 10:23:21',
'docstatus': 0,
'modified': '2010-12-24 11:56:34',
'modified_by': 'Administrator',
'owner': 'Administrator'
u'creation': '2012-06-14 15:07:26',
u'docstatus': 0,
u'modified': '2012-10-04 17:34:55',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
# These values are common for all Page
{
'doctype': 'Page',
'module': 'Selling',
'name': '__common__',
'page_name': 'Sales Browser',
u'doctype': u'Page',
'module': u'Selling',
u'name': u'__common__',
'page_name': u'Sales Browser',
'show_in_menu': 0,
'standard': 'Yes'
'standard': u'Yes'
},
# These values are common for all Page Role
{
'doctype': 'Page Role',
'name': '__common__',
'parent': 'Sales Browser',
'parentfield': 'roles',
'parenttype': 'Page'
u'doctype': u'Page Role',
u'name': u'__common__',
'parent': u'Sales Browser',
'parentfield': u'roles',
'parenttype': u'Page'
},
# Page, Sales Browser
{
'doctype': 'Page',
'name': 'Sales Browser'
u'doctype': u'Page',
u'name': u'Sales Browser'
},
# Page Role
{
'doctype': 'Page Role',
'idx': 1,
'role': 'Sales Master Manager'
u'doctype': u'Page Role',
'role': u'Sales Master Manager'
},
# Page Role
{
'doctype': 'Page Role',
'idx': 2,
'role': 'Material Master Manager'
u'doctype': u'Page Role',
'role': u'Material Master Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Accounts Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Sales Master Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Purchase Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Purchase Master Manager'
},
# Page Role
{
u'doctype': u'Page Role',
'role': u'Material Manager'
}
]

26
selling/page/selling_home/selling_home.html
View File

@@ -27,7 +27,8 @@
<h4><a href="#!List/Address">Address</a></h4>
<p class="help">Address Master</p>
<br>
<h4><a href="#sales-analytics" data-role="Analytics">Sales Analytics</a>
<h4><a href="#sales-analytics" data-role="Analytics, Sales Manager,
Maintenance Manager">Sales Analytics</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span>
</h4>
<p class="help">Sales trends based on Sales Invoice</p>
@@ -65,17 +66,23 @@
<div class="section-item">
<a class="section-link"
title = "Tree of customer groups"
href="#!Sales Browser/Customer Group">Customer Group</a>
href="#!Sales Browser/Customer Group"
data-role="Sales Manager, Sales Master Manager,
Accounts Manager">Customer Group</a>
</div>
<div class="section-item">
<a class="section-link"
title = "Tree of sales territories"
href="#!Sales Browser/Territory">Territory</a>
href="#!Sales Browser/Territory"
data-role="Sales Manager, Sales Master Manager
Accounts Manager">Territory</a>
</div>
<div class="section-item">
<a class="section-link"
title = "Sales persons and targets"
href="#!Sales Browser/Sales Person">Sales Person</a>
href="#!Sales Browser/Sales Person"
data-role="Sales Manager, Sales Master Manager
Accounts Manager">Sales Person</a>
</div>
<div class="section-item">
<a class="section-link"
@@ -85,7 +92,9 @@
<div class="section-item">
<a class="section-link"
title = "Tree of item classification"
href="#!Sales Browser/Item Group">Item Group</a>
href="#!Sales Browser/Item Group"
data-role="Sales Manager, Sales Master Manager
Accounts Manager">Item Group</a>
</div>
<div class="section-item">
<a class="section-link"
@@ -108,15 +117,10 @@
href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales Returns</a>
</div>
<div class="section-item">
<a class="section-link"
<a class="section-link"
title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc"
href="#!Report/Profile/Trend Analyzer">Trend Analyzer</a>
</div>
<!--<div class="section-item">
<a class="section-link"
title = "sales trends"
href="#!Sales Dashboard">Sales Dashboard</a>
</div>-->
</div>
</div>
</div>