Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py
index 8b54f0f..15976b8 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.py
+++ b/accounts/doctype/journal_voucher/journal_voucher.py
@@ -375,7 +375,7 @@
(filters["account"], "%%%s%%" % txt, start, page_len))
def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
- return webnotes.conn.sql("""select name, posting_date, user_remark
+ return webnotes.conn.sql("""select jv.name, jv.posting_date, jv.user_remark
from `tabJournal Voucher` jv, `tabJournal Voucher Detail` jv_detail
where jv_detail.parent = jv.name and jv_detail.account = %s and docstatus = 1
and jv.%s like %s order by jv.name desc limit %s, %s""" %
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index ae8c6c4..e162551 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-28 17:07:01",
"docstatus": 0,
- "modified": "2013-03-26 13:07:11",
+ "modified": "2013-03-26 14:05:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -118,6 +118,18 @@
"search_index": 0
},
{
+ "depends_on": "eval:doc.source == 'Customer'",
+ "description": "Source of th",
+ "doctype": "DocField",
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "From Customer",
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer"
+ },
+ {
"depends_on": "eval:doc.source == 'Campaign'",
"description": "Enter campaign name if the source of lead is campaign.",
"doctype": "DocField",
@@ -145,37 +157,10 @@
},
{
"doctype": "DocField",
- "fieldname": "sb8",
+ "fieldname": "contact_info",
"fieldtype": "Section Break",
- "label": "Lead Details"
- },
- {
- "depends_on": "eval:doc.source == 'Existing Customer'",
- "description": "Source of th",
- "doctype": "DocField",
- "fieldname": "customer",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "From Customer",
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer"
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "type",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Lead Type",
- "oldfieldname": "type",
- "oldfieldtype": "Select",
- "options": "\nClient\nChannel Partner\nConsultant"
+ "label": "Contact Info",
+ "oldfieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -187,13 +172,6 @@
},
{
"doctype": "DocField",
- "fieldname": "contact_info",
- "fieldtype": "Section Break",
- "label": "Contact Info",
- "oldfieldtype": "Column Break"
- },
- {
- "doctype": "DocField",
"fieldname": "phone",
"fieldtype": "Data",
"label": "Phone",
@@ -308,6 +286,16 @@
"oldfieldtype": "Section Break"
},
{
+ "doctype": "DocField",
+ "fieldname": "type",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Lead Type",
+ "oldfieldname": "type",
+ "oldfieldtype": "Select",
+ "options": "\nClient\nChannel Partner\nConsultant"
+ },
+ {
"default": "__user",
"doctype": "DocField",
"fieldname": "lead_owner",