Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 183352c..a7a148a 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,4 +1,5 @@
erpnext.updates = [
+ ["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
["19th March", ["Sales and Purchase Return Tool deprecated. Use Stock Entry instead."]],
["12th March", ["Updates to website module. Added more options in Style Settings and Website Settings."]],
["5th March", ["Refactored Upload Attendance Tool"]],
diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js
index 7f847b9..d4a034f 100644
--- a/projects/doctype/project/project.js
+++ b/projects/doctype/project/project.js
@@ -26,6 +26,9 @@
.appendTo(cur_frm.fields_dict.project_tasks.wrapper);
cur_frm.gantt_area.empty();
erpnext.show_task_gantt(cur_frm.gantt_area, cur_frm.docname);
+ } else {
+ if(cur_frm.gantt_area)
+ cur_frm.gantt_area.empty();
}
}
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index 40d2f1b..ae8c6c4 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-28 10:06:01",
+ "creation": "2013-01-28 17:07:01",
"docstatus": 0,
- "modified": "2013-01-28 15:28:49",
+ "modified": "2013-03-26 13:07:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -23,18 +23,13 @@
"permlevel": 0
},
{
- "amend": 0,
- "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Lead",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
"read": 1,
- "report": 1,
- "submit": 0,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -65,6 +60,19 @@
"search_index": 1
},
{
+ "description": "Name of organization from where lead has come",
+ "doctype": "DocField",
+ "fieldname": "company_name",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Company Name",
+ "oldfieldname": "company_name",
+ "oldfieldtype": "Data",
+ "reqd": 0,
+ "search_index": 0
+ },
+ {
"doctype": "DocField",
"fieldname": "email_id",
"fieldtype": "Data",
@@ -105,11 +113,23 @@
"no_copy": 1,
"oldfieldname": "source",
"oldfieldtype": "Select",
- "options": "\nAdvertisement\nBlog\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail",
+ "options": "\nAdvertisement\nBlog Post\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail",
"reqd": 0,
"search_index": 0
},
{
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "description": "Enter campaign name if the source of lead is campaign.",
+ "doctype": "DocField",
+ "fieldname": "campaign_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Campaign Name",
+ "oldfieldname": "campaign_name",
+ "oldfieldtype": "Link",
+ "options": "Campaign"
+ },
+ {
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break"
@@ -130,19 +150,6 @@
"label": "Lead Details"
},
{
- "description": "Name of organization from where lead has come",
- "doctype": "DocField",
- "fieldname": "company_name",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Company Name",
- "oldfieldname": "company_name",
- "oldfieldtype": "Data",
- "reqd": 0,
- "search_index": 0
- },
- {
"depends_on": "eval:doc.source == 'Existing Customer'",
"description": "Source of th",
"doctype": "DocField",
@@ -155,18 +162,6 @@
"options": "Customer"
},
{
- "depends_on": "eval:doc.source == 'Campaign'",
- "description": "Enter campaign name if the source of lead is campaign.",
- "doctype": "DocField",
- "fieldname": "campaign_name",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Campaign Name",
- "oldfieldname": "campaign_name",
- "oldfieldtype": "Link",
- "options": "Campaign"
- },
- {
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
@@ -462,18 +457,69 @@
"label": "Blog Subscriber"
},
{
- "cancel": 0,
+ "create": 1,
"doctype": "DocPerm",
- "role": "Sales User"
+ "permlevel": 0,
+ "report": 1,
+ "role": "Guest",
+ "write": 1
},
{
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "report": 0,
+ "role": "Sales User",
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "report": 0,
+ "role": "Sales Manager",
+ "write": 0
+ },
+ {
+ "amend": 0,
"cancel": 1,
+ "create": 1,
"doctype": "DocPerm",
- "role": "Sales Manager"
+ "permlevel": 0,
+ "report": 1,
+ "role": "Sales Manager",
+ "write": 1
},
{
+ "amend": 0,
"cancel": 0,
+ "create": 1,
"doctype": "DocPerm",
- "role": "System Manager"
+ "permlevel": 0,
+ "report": 1,
+ "role": "Sales User",
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "role": "All"
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
+ "role": "System Manager",
+ "write": 1
}
]
\ No newline at end of file
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index e15565a..8a8d8d0 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -860,9 +860,9 @@
alert("Commision rate cannot be greater than 100.");
doc.total_commission = 0;
doc.commission_rate = 0;
- }
- else
+ } else {
doc.total_commission = doc.net_total * doc.commission_rate / 100;
+ }
refresh_many(['total_commission','commission_rate']);
}
@@ -874,9 +874,9 @@
alert("Total commission cannot be greater than net total.");
doc.total_commission = 0;
doc.commission_rate = 0;
- }
- else
+ } else {
doc.commission_rate = doc.total_commission * 100 / doc.net_total;
+ }
refresh_many(['total_commission','commission_rate']);
}
}