removed readme

2026-06-07 23:22:52 +00:00 · 2011-09-13 15:48:51 +05:30
parent cbaae20328 7272080eeb
commit 5f50617121
26 changed files with 495 additions and 210 deletions
--- a/Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
+++ b/Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
@@ -5,8 +5,8 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2011-05-10 16:04:40',
-		'modified_by': 'umair@iwebnotes.com',
+		'modified': '2011-09-07 12:12:30',
+		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},

@@ -23,7 +23,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
 		'name': '__common__',
 		'parent': 'Enquiry-Quotation',
 		'parentfield': 'field_mapper_details',
@@ -32,7 +31,7 @@

 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Enquiry',
 		'module': 'Selling',
 		'name': '__common__',
@@ -42,7 +41,7 @@

 	# DocType Mapper, Enquiry-Quotation
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Enquiry-Quotation'
 	},

@@ -50,6 +49,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'uom',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'stock_uom'
 	},
@@ -58,6 +58,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'enq_no'
 	},
@@ -66,6 +67,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_docname'
 	},
@@ -74,6 +76,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_doctype'
 	},
@@ -82,6 +85,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'enquiry_from',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'quotation_to'
 	},
@@ -90,10 +94,38 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'enquiry_type',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'order_type'
 	},

+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'transaction_date',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'transaction_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'status'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
--- a/Mapper/Lead-Customer/Lead-Customer.txt
+++ b/Mapper/Lead-Customer/Lead-Customer.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2010-10-14 13:39:44',
+		'modified': '2011-09-07 12:11:39',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -36,7 +36,7 @@

 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Lead',
 		'module': 'Selling',
 		'name': '__common__',
@@ -45,7 +45,7 @@

 	# DocType Mapper, Lead-Customer
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Lead-Customer'
 	},

@@ -63,20 +63,6 @@
 		'to_field': 'customer_name'
 	},

-	# Field Mapper Detail
-	{
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'to_field': 'phone_1'
-	},
-
-	# Field Mapper Detail
-	{
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'fax',
-		'to_field': 'fax_1'
-	},
-
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail'
--- a/Mapper/Lead-Enquiry/Lead-Enquiry.txt
+++ b/Mapper/Lead-Enquiry/Lead-Enquiry.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2010-08-05 20:21:54',
+		'modified': '2011-09-07 12:11:00',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -26,7 +26,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
 		'match_id': 0,
 		'name': '__common__',
 		'parent': 'Lead-Enquiry',
@@ -36,7 +35,7 @@

 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Lead',
 		'module': 'Selling',
 		'name': '__common__',
@@ -45,7 +44,7 @@

 	# DocType Mapper, Lead-Enquiry
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Lead-Enquiry'
 	},

@@ -53,6 +52,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign_name',
+		'map': 'Yes',
 		'to_field': 'campaign'
 	},

@@ -60,6 +60,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'doctype',
+		'map': 'Yes',
 		'to_field': 'enquiry_from'
 	},

@@ -67,9 +68,18 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'to_field': 'lead'
 	},

+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'to_field': 'status'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail'
--- a/erpnext/selling/DocType
+++ b/erpnext/selling/DocType
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'modified': '2011-08-25 18:25:02',
+		'modified': '2011-09-07 12:08:48',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -30,7 +30,7 @@

 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Quotation',
 		'module': 'Selling',
 		'name': '__common__',
@@ -40,7 +40,7 @@

 	# DocType Mapper, Quotation-Sales Order
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Quotation-Sales Order'
 	},

@@ -110,6 +110,15 @@
 		'to_field': 'naming_series'
 	},

+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'status'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -312,10 +312,11 @@ cur_frm.cscript.validate = function(doc,cdt,cdn){
 //================ Last Quoted Price and Last Sold Price suggestion ======================
 cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query= function(doc, cdt, cdn) {
  var d = locals[cdt][cdn];
+  var cond = (doc.order_type == 'Maintenance')? " and tabItem.is_service_item = 'Yes'" : " and tabItem.is_sales_item = 'Yes'"
  if(doc.customer)
    return repl("SELECT i.name,i.item_code,concat('Last quoted at - ',cast(quote_rate as char)) as quote_rate,concat('Last sold at - ',cast(sales_rate as char)) as sales_rate FROM\
 		(\
-			select item_code,name from tabItem where tabItem.%(key)s like '%s'\
+			select item_code,name from tabItem where tabItem.%(key)s like '%s' %(cond)s\
 		)i\
 		left join\
 		(\
@@ -336,7 +337,7 @@ cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query=
 			(\
 				select rd.item_code,max(voucher_date) as voucher_date from `tabRV Detail` rd, `tabReceivable Voucher` r where r.name=rd.parent and r.docstatus=1 and customer='%(cust)s' group by rd.item_code\
 			)m where r.item_code=m.item_code and r.voucher_date=m.voucher_date\
-		)s on i.item_code=s.item_code ORDER BY item_code LIMIT 50",{cust:doc.customer});
+		)s on i.item_code=s.item_code ORDER BY item_code LIMIT 50",{cust:doc.customer, cond:cond});
  else
-    return "SELECT name, item_code FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' ORDER BY tabItem.item_code DESC LIMIT 50";
-}
+    return repl("SELECT name, item_code FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' %(cond)s ORDER BY tabItem.item_code DESC LIMIT 50", {cond:cond});
+}