From 83ca3e55634967ac3e714e9b6545ede8d0b886d8 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 28 Aug 2014 14:48:16 +0530 Subject: [PATCH 1/4] [Cosmetics] Print Templates Layout Improved --- .../cheque_printing_format/cheque_printing_format.json | 5 +++-- .../payment_receipt_voucher/payment_receipt_voucher.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 4bafe8530a9..617b7d6a76a 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": "
\n\n\t{% if letter_head and not no_letterhead %}{{ letter_head }}{%- endif -%}\n\t

{{ _(\"Payment Advice\") }}

\n\t
\n\t
\n\t
{{ doc.pay_to_recd_from }}
\n\t
\n\t
\n\t
\n\t
{{ doc.name }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.cheque_no }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n\t
\n\t
\n\t
\n\t
{{ \n\t \tfrappe.format_value(doc.total_amount, doc.meta.get_field(\"total_amount\"), doc) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.remark }}
\n\t
\n\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", + "html": "
\n\n\t{% if letter_head and not no_letterhead %}{{ letter_head }}{%- endif -%}\n\t

{{ _(\"Payment Advice\") }}

\n\t
\n\t
\n\t
{{ doc.pay_to_recd_from }}
\n\t
\n\t
\n\t
\n\t
{{ doc.name }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.cheque_no }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n\t
\n\t
\n
\n
\n
\n
\n\t
\n\t
\n\t
{{ doc.remark }}
\n\t
\n\t
\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", "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 9a9398df8d7..f44da544a82 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": "

{{ doc.select_print_heading or _(\"Payment Receipt Note\") }}

\n
\n
\n
\n
{{ doc.name }}
\n
\n
\n
\n
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n
\n
\n
\n
{{ doc.remark }}
\n
\n
\n
\n
{{ doc.pay_to_recd_from }}
\n
\n
\n
\n
{{ doc.total_amount }}
{{ doc.total_amount_in_words }}
\n
\n
\n

\n{{ _(\"For\") }} {{ doc.company }},
\n
\n
\n
\n{{ _(\"Authorized Signatory\") }}

", + "html": "

{{ doc.select_print_heading or _(\"Payment Receipt Note\") }}

\n
\n
\n
\n
{{ doc.name }}
\n
\n
\n
\n
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n
\n
\n
\n
{{ doc.pay_to_recd_from }}
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
{{ doc.remark }}
\n
\n
\n

\n{{ _(\"For\") }} {{ doc.company }},
\n
\n
\n
\n{{ _(\"Authorized Signatory\") }}

", "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", From f65817d4c26072a01095e02f01514046f9a1854a Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 29 Aug 2014 16:31:57 +0530 Subject: [PATCH 2/4] [cosmetics] payment receipt Print format 1 --- .../payment_receipt_voucher/payment_receipt_voucher.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f44da544a82..2944b4b986c 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": "

{{ doc.select_print_heading or _(\"Payment Receipt Note\") }}

\n
\n
\n
\n
{{ doc.name }}
\n
\n
\n
\n
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n
\n
\n
\n
{{ doc.pay_to_recd_from }}
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
{{ doc.remark }}
\n
\n
\n

\n{{ _(\"For\") }} {{ doc.company }},
\n
\n
\n
\n{{ _(\"Authorized Signatory\") }}

", + "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n
\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Receipt Note\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n {%- for label, value in (\n (_(\"Received On\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Received From\"), doc.pay_to_recd_from),\n (_(\"Amount\"), \"\" + doc.total_amount + \"
\" + (doc.total_amount_in_words or \"\") + \"
\"),\n (_(\"Remarks\"), doc.remark)\n ) -%}\n
\n
\n
{{ value }}
\n
\n\n {%- endfor -%}\n\n
\n
\n

\n {{ _(\"For\") }} {{ doc.company }},
\n
\n
\n
\n {{ _(\"Authorized Signatory\") }}\n

\n
\n\n", "idx": 1, - "modified": "2014-08-28 14:42:51.882718", + "modified": "2014-08-29 15:55:34.248384", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Receipt Voucher", From d43752fc4fea706506b6f75f75067518066e652c Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 29 Aug 2014 16:43:48 +0530 Subject: [PATCH 3/4] [cosmetics] Cheque Print format 1 --- .../cheque_printing_format/cheque_printing_format.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 617b7d6a76a..dc07b279b8a 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,9 +3,9 @@ "doc_type": "Journal Voucher", "docstatus": 0, "doctype": "Print Format", - "html": "
\n\n\t{% if letter_head and not no_letterhead %}{{ letter_head }}{%- endif -%}\n\t

{{ _(\"Payment Advice\") }}

\n\t
\n\t
\n\t
{{ doc.pay_to_recd_from }}
\n\t
\n\t
\n\t
\n\t
{{ doc.name }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.cheque_no }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n\t
\n\t
\n
\n
\n
\n
\n\t
\n\t
\n\t
{{ doc.remark }}
\n\t
\n\t
\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", + "html": "
\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n
\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.cheque_no }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n\t
\n\t
\n
\n
\n
\n
\n\t
\n\t
\n\t
{{ doc.remark }}
\n\t
\n\t
\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", "idx": 1, - "modified": "2014-08-28 14:41:51.888412", + "modified": "2014-08-29 16:41:49.896932", "modified_by": "Administrator", "module": "Accounts", "name": "Cheque Printing Format", From 8331ec7482ab98e8475f77aa22437f1184cf72c9 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 29 Aug 2014 20:27:45 +0530 Subject: [PATCH 4/4] [cosmetics] Cheque Print format 2 --- .../cheque_printing_format/cheque_printing_format.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dc07b279b8a..47fe0133659 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,9 +3,9 @@ "doc_type": "Journal Voucher", "docstatus": 0, "doctype": "Print Format", - "html": "
\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n
\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.voucher_date) }}
\n\t
\n\t
\n\t
\n\t
{{ doc.cheque_no }}
\n\t
\n\t
\n\t
\n\t
{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n\t
\n\t
\n
\n
\n
\n
\n\t
\n\t
\n\t
{{ doc.remark }}
\n\t
\n\t
\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", + "html": "
\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n
\n {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n{%- for label, value in (\n (_(\"Voucher Date\"), frappe.utils.formatdate(doc.voucher_date)),\n (_(\"Reference / Cheque No.\"), doc.cheque_no),\n (_(\"Reference / Cheque Date\"), frappe.utils.formatdate(doc.cheque_date))\n ) -%}\n
\n
\n
{{ value }}
\n
\n{%- endfor -%}\n\t
\n\t

{{ _(\"This amount is in full / part settlement of the listed bills\") }}:

\n{%- for label, value in (\n (_(\"Amount\"), \"\" + doc.total_amount + \"
\" + (doc.total_amount_in_words or \"\") + \"
\"),\n (_(\"References\"), doc.remark)\n ) -%}\n
\n
\n
{{ value }}
\n
\n {%- endfor -%}\n
\n\t
\n\t\tPrepared By
\n\t
\n\t\tAuthorised Signatory
\n\t
\n\t\tReceived Payment as Above
\n\t
\n\t\t_____________
\n\t
\n\t\tA/C Payee
\n\t
\n\t\t_____________
\n\t
\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}
\n\t
\n\t\t{{ doc.pay_to_recd_from }}
\n\t
\n\t\t{{ doc.total_amount_in_words }}
\n\t
\n\t\t{{ doc.total_amount }}
\n
", "idx": 1, - "modified": "2014-08-29 16:41:49.896932", + "modified": "2014-08-29 19:54:01.082535", "modified_by": "Administrator", "module": "Accounts", "name": "Cheque Printing Format",