Merge pull request #142 from anandpdoshi/master

New Print Formats as part of erpnext repository

erpnext/patches/install_print_formats.py

@@ -53,13 +53,14 @@ def execute():
 		Install print formats
 	"""
 	from webnotes.modules.module_manager import reload_doc
-	reload_doc('core', 'doctype', 'print_format')
+	#reload_doc('core', 'doctype', 'print_format')
 	
-	copy_doctype_to_pfs()
+	#copy_doctype_to_pfs()
 	global pf_to_install
 	for pf in pf_to_install:
-		install_print_format(pf)
-		print "Installed PF: " + pf['name']
+	#	install_print_format(pf)
+	#	print "Installed PF: " + pf['name']
+		reload_doc(pf['module'], 'Print Format', pf['name'])
 
 
 def copy_doctype_to_pfs():

erpnext/patches/print_formats/QuotationClassic.html

@@ -98,7 +98,7 @@
 				'Quotation Detail',
 				[// Here specify the table columns to be displayed
 					'SR', 'item_code', 'item_name', 'description', 'qty', 'stock_uom',
-					'basic_rate', 'amount'
+					'export_rate', 'export_amount'
 				],
 				[// Here specify the labels of column headings
 					'Sr', 'Item Code', 'Item Name', 'Description', 'Qty',
@@ -168,7 +168,7 @@
 				<td width=60%><table width=100% cellspacing=0><tbody>
 					<tr>
 						<td width=39%><b>Name</b></td>
-						<td><script>doc.lead_name</script></td>
+						<td><script>doc.customer?doc.customer:doc.lead_name</script></td>
 					</tr>
 					<tr>
 						<td><b>Address</b></td>
@@ -224,7 +224,7 @@
 							<td>Net Total</td>
 							<td></td>
 							<td width=38%><script>
-								fmt_money(doc.net_total)
+								fmt_money(doc.net_total/doc.conversion_rate)
 							</script></td>
 						</tr>
 						<tr><td colspan=3><script>si_std.print_other_charges()</script></td></tr>

erpnext/patches/print_formats/QuotationModern.html

@@ -121,7 +121,7 @@
 				'Quotation Detail',
 				[// Here specify the table columns to be displayed
 					'SR', 'item_code', 'item_name', 'description', 'qty', 'stock_uom',
-					'basic_rate', 'amount'
+					'export_rate', 'export_amount'
 				],
 				[// Here specify the labels of column headings
 					'Sr', 'Item Code', 'Item Name', 'Description', 'Qty',
@@ -191,7 +191,7 @@
 				<td width=60%><table width=100% cellspacing=0><tbody>
 					<tr>
 						<td width=39%><b>Name</b></td>
-						<td><script>doc.lead_name</script></td>
+						<td><script>doc.customer?doc.customer:doc.lead_name</script></td>
 					</tr>
 					<tr>
 						<td><b>Address</b></td>
@@ -251,7 +251,7 @@
 							<td>Net Total</td>
 							<td></td>
 							<td width=38%><script>
-								fmt_money(doc.net_total)
+								fmt_money(doc.net_total/doc.conversion_rate)
 							</script></td>
 						</tr>
 						<tr><td colspan=3><script>si_std.print_other_charges()</script></td></tr>

erpnext/patches/print_formats/QuotationSpartan.html

@@ -120,7 +120,7 @@
 				'Quotation Detail',
 				[// Here specify the table columns to be displayed
 					'SR', 'item_code', 'item_name', 'description', 'qty', 'stock_uom',
-					'basic_rate', 'amount'
+					'export_rate', 'export_amount'
 				],
 				[// Here specify the labels of column headings
 					'Sr', 'Item Code', 'Item Name', 'Description', 'Qty',
@@ -190,7 +190,7 @@
 				<td width=60%><table width=100% cellspacing=0><tbody>
 					<tr>
 						<td width=39%><b>Name</b></td>
-						<td><script>doc.lead_name</script></td>
+						<td><script>doc.customer?doc.customer:doc.lead_name</script></td>
 					</tr>
 					<tr>
 						<td><b>Address</b></td>
@@ -246,7 +246,7 @@
 							<td>Net Total</td>
 							<td></td>
 							<td width=38%><script>
-								fmt_money(doc.net_total)
+								fmt_money(doc.net_total/doc.conversion_rate)
 							</script></td>
 						</tr>
 						<tr><td colspan=3><script>si_std.print_other_charges()</script></td></tr>