diff --git a/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json b/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
index 4bafe85..617b7d6 100755
--- a/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
+++ b/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
@@ -3,12 +3,13 @@
  "doc_type": "Journal Voucher", 
  "docstatus": 0, 
  "doctype": "Print Format", 
- "html": "<div style=\"position: relative\">\n\n\t{% if letter_head and not no_letterhead %}{{ letter_head }}{%- endif -%}\n\t<h4>{{ _(\"Payment Advice\") }}</h4>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"To\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ doc.pay_to_recd_from }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Voucher No\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ doc.name }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Voucher Date\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ frappe.utils.formatdate(doc.voucher_date) }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Reference / Cheque No\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ doc.cheque_no }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Reference / Cheque Date\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Voucher Date\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ frappe.utils.formatdate(doc.voucher_date) }}</div>\n\t</div>\n\t<br>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n\t<hr>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"Total Amount\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ \n\t  \tfrappe.format_value(doc.total_amount, doc.meta.get_field(\"total_amount\"), doc) }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-3\"><label>{{ _(\"References\") }}:</label></div>\n\t  <div class=\"col-sm-9\">{{ doc.remark }}</div>\n\t</div>\n\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.total_amount }}</div>\n</div>", 
+ "html": "<div style=\"position: relative\">\n\n\t{% if letter_head and not no_letterhead %}{{ letter_head }}{%- endif -%}\n\t<h3 align=right>{{ _(\"Payment Advice\") }}</h3><hr>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"To\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ doc.pay_to_recd_from }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"Voucher No\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ doc.name }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"Voucher Date\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ frappe.utils.formatdate(doc.voucher_date) }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"Reference / Cheque No\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ doc.cheque_no }}</div>\n\t</div>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"Reference / Cheque Date\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t</div>\n\t<br>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n\t<hr>\n\t<div class=\"row\">\n        <div class=\"col-sm-4\"><label align=right>{{ _(\"Total Amount\") }}</label></div>\n        <div class=\"col-sm-8\"><label>{{ doc.total_amount }}/-<br>{{ doc.total_amount_in_words }}</label></div>\n        </div>\n        <hr>\n\t<div class=\"row\">\n\t  <div class=\"col-sm-4\"><label align=right>{{ _(\"References\") }}</label></div>\n\t  <div class=\"col-sm-8\">{{ doc.remark }}</div>\n\t</div>\n\t<hr>\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.total_amount }}</div>\n</div>", 
  "idx": 1, 
- "modified": "2014-07-21 08:53:57.749885", 
+ "modified": "2014-08-28 14:41:51.888412", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cheque Printing Format", 
  "owner": "Administrator", 
+ "print_format_type": "Server", 
  "standard": "Yes"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
index 9a9398d..f44da54 100755
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
@@ -3,9 +3,9 @@
  "doc_type": "Journal Voucher", 
  "docstatus": 0, 
  "doctype": "Print Format", 
- "html": "<h3 class=\"text-center\">{{ doc.select_print_heading or _(\"Payment Receipt Note\") }}</h3>\n<hr>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label>{{ _(\"Receipt No\") }}:</label></div>\n  <div class=\"col-sm-9\">{{ doc.name }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label>{{ _(\"Received On\") }}:</label></div>\n  <div class=\"col-sm-9\">{{ frappe.utils.formatdate(doc.voucher_date) }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label>{{ _(\"Remark\") }}:</label></div>\n  <div class=\"col-sm-9\">{{ doc.remark }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label>{{ _(\"Received From\") }}:</label></div>\n  <div class=\"col-sm-9\">{{ doc.pay_to_recd_from }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label>{{ _(\"Total Amount\") }}:</label></div>\n  <div class=\"col-sm-9\">{{ doc.total_amount }}<br>{{ doc.total_amount_in_words }}</div>\n</div>\n<br>\n<p>\n{{ _(\"For\") }} {{ doc.company }},<br>\n<br>\n<br>\n<br>\n{{ _(\"Authorized Signatory\") }}</p>", 
+ "html": "<h3 class=\"text-right\">{{ doc.select_print_heading or _(\"Payment Receipt Note\") }}</h3>\n<hr>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label align=right>{{ _(\"Receipt No\") }}</label></div>\n  <div class=\"col-sm-9\">{{ doc.name }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label align=right>{{ _(\"Received On\") }}</label></div>\n  <div class=\"col-sm-9\">{{ frappe.utils.formatdate(doc.voucher_date) }}</div>\n</div>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label align=right>{{ _(\"Received From\") }}</label></div>\n  <div class=\"col-sm-9\">{{ doc.pay_to_recd_from }}</div>\n</div>\n<hr>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label align=right>{{ _(\"Total Amount\") }}</label></div>\n  <div class=\"col-sm-9\"><label>{{ doc.total_amount }}/-<br>{{ doc.total_amount_in_words }}</label></div>\n</div>\n<hr>\n<div class=\"row\">\n  <div class=\"col-sm-3\"><label align=right>{{ _(\"Remark\") }}</label></div>\n  <div class=\"col-sm-9\">{{ doc.remark }}</div>\n</div>\n<hr>\n<p>\n{{ _(\"For\") }} {{ doc.company }},<br>\n<br>\n<br>\n<br>\n{{ _(\"Authorized Signatory\") }}</p>", 
  "idx": 1, 
- "modified": "2014-07-21 08:53:17.393966", 
+ "modified": "2014-08-28 14:42:51.882718", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Receipt Voucher",