From 7762bdaf7741555773ff0ea168627b19355b6315 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 19 Oct 2011 15:05:26 +0530 Subject: [PATCH] Letter head issue fixed in print format --- .../Cheque Printing Format.txt | 4 +-- .../Form 16A Print Format.txt | 4 +-- .../Print Format/POS Invoice/POS Invoice.txt | 27 +++++++++++++++++++ .../Payment Receipt Voucher.txt | 8 +++--- .../receivable_voucher/receivable_voucher.txt | 27 ++++++++++++++----- .../Delivery Note Packing List Wise.txt | 6 ++--- .../Purchase Receipt Format.txt | 4 +-- 7 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt diff --git a/erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt b/erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt index e0d2bce9e6..aa903116e0 100755 --- a/erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt +++ b/erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt @@ -3,10 +3,10 @@ # These values are common in all dictionaries { - 'creation': '2011-03-25 15:26:02', + 'creation': '2011-03-28 15:17:25', 'docstatus': 0, 'modified': '2011-03-28 12:33:24', - 'modified_by': 'Administrator', + 'modified_by': 'umair@iwebnotes.com', 'owner': 'Administrator' }, diff --git a/erpnext/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt b/erpnext/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt index 831630677f..4da5443618 100644 --- a/erpnext/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt +++ b/erpnext/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt @@ -5,7 +5,7 @@ { 'creation': '2010-09-27 17:30:34', 'docstatus': 0, - 'modified': '2011-06-15 13:36:06', + 'modified': '2011-10-19 14:19:27', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -13,7 +13,7 @@ # These values are common for all Print Format { 'doctype': 'Print Format', - 'html': '\n \n\n\n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n

FORM No. 16 A

\n

Certificate No:

\n

[See rule 31 (1)(b)]

\n

Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961

\n

[For interest on securities; dividends; interests other than \'interests on securities\';winnings from lottery or crossword puzzle;\n winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n \n non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n \n on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section

\n 196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n
Name and address of person deducing taxAcknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-siteName and address of the person to whom payment is made or in whose account it is credited
\n \n

\n \n
\n 		\n \n \n \n

\n \n
\n
\n \n Registration Details OF THE DEDUCTOR
\n \n
\n 		\n \n
NATURE OF PAYMENT


\n
\n \n
\n 		\n \n PAN NO. OF THE PAYEE
\n \n \n
\n
DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT\n

(The deductor is to provide transaction wise details of tax deducted and deposited)

\n
\n \n
\n Certified that a sum of Rs. has been deducted at source and paid to the credit of the Central Government as per details given above



\n

Signature of person responsible for deduction of tax \n

\n \n \n \n \n \n \n \n \n \n
Place: Full Name:
Date: Designation:
\n
\n\n', + 'html': '\n \n\n\n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
\n
\n

FORM No. 16 A

\n

Certificate No:

\n

[See rule 31 (1)(b)]

\n

Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961

\n

[For interest on securities; dividends; interests other than \'interests on securities\';winnings from lottery or crossword puzzle;\n winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n \n non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n \n on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section

\n 196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n
Name and address of person deducing taxAcknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-siteName and address of the person to whom payment is made or in whose account it is credited
\n \n

\n \n
\n 		\n \n \n \n

\n \n
\n
\n \n Registration Details OF THE DEDUCTOR
\n \n
\n 		\n \n
NATURE OF PAYMENT


\n
\n \n
\n 		\n \n PAN NO. OF THE PAYEE
\n \n \n
\n
DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT\n

(The deductor is to provide transaction wise details of tax deducted and deposited)

\n
\n \n
\n Certified that a sum of Rs. has been deducted at source and paid to the credit of the Central Government as per details given above



\n

Signature of person responsible for deduction of tax \n

\n \n \n \n \n \n \n \n \n \n
Place: Full Name:
Date: Designation:
\n
\n\n', 'module': 'Accounts', 'name': '__common__', 'standard': 'Yes' diff --git a/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt b/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt new file mode 100644 index 0000000000..6a7e83589f --- /dev/null +++ b/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt @@ -0,0 +1,27 @@ +# Print Format, POS Invoice +[ + + # These values are common in all dictionaries + { + 'creation': '2011-10-19 14:27:47', + 'docstatus': 0, + 'modified': '2011-10-19 14:29:45', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Print Format + { + 'doctype': 'Print Format', + 'html': '\n\n\n\n\n\n\n
\n\n\n\n\n\n\n\n\n
NO: DATE:
M/s
\n\n
\n \n\n
\n\n\n
\n \n
\n\n
\n\n\n\n\n\n
For
 
Signatory
\n\n', + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Print Format, POS Invoice + { + 'doctype': 'Print Format', + 'name': 'POS Invoice' + } +] \ No newline at end of file diff --git a/erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt index fa0145af2d..932df2e5d6 100755 --- a/erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt +++ b/erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt @@ -3,17 +3,17 @@ # These values are common in all dictionaries { - 'creation': '2011-03-25 17:30:45', + 'creation': '2011-03-28 15:17:25', 'docstatus': 0, - 'modified': '2011-04-27 11:44:30', - 'modified_by': 'Administrator', + 'modified': '2011-03-28 12:31:40', + 'modified_by': 'umair@iwebnotes.com', 'owner': 'Administrator' }, # These values are common for all Print Format { 'doctype': 'Print Format', - 'html': '
\n

\n

\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
This receipt is issued subject to realization of the
\n\n
\n\n\n\n\n

For ,


(Authorised Signatory)
', + 'html': '
\n

\n

\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
This receipt is issued subject to realization of the Cheque
\n\n
\n\n\n\n\n

For ,


(Authorised Signatory)
', 'module': 'Accounts', 'name': '__common__', 'standard': 'Yes' diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt index 2f3b48d3fc..99c1029bcb 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt @@ -5,14 +5,23 @@ { 'creation': '2010-08-08 17:09:18', 'docstatus': 0, - 'modified': '2011-10-10 12:29:26', + 'modified': '2011-10-19 15:02:04', 'modified_by': 'Administrator', 'owner': 'Administrator' }, + # These values are common for all DocField + { + 'doctype': 'DocField', + 'name': '__common__', + 'parent': 'Receivable Voucher', + 'parentfield': 'fields', + 'parenttype': 'DocType' + }, + # These values are common for all DocType { - '_last_update': '1317986484', + '_last_update': '1319014846', 'change_log': '1. Change in pull_details method dt.-26-06-2009', 'colour': 'White:FFF', 'default_print_format': 'Standard', @@ -25,15 +34,16 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': 'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 359 + 'version': 361 }, - # These values are common for all DocField + # These values are common for all DocFormat { - 'doctype': 'DocField', + 'doctype': 'DocFormat', + 'format': 'POS Invoice', 'name': '__common__', 'parent': 'Receivable Voucher', - 'parentfield': 'fields', + 'parentfield': 'formats', 'parenttype': 'DocType' }, @@ -114,6 +124,11 @@ 'write': 0 }, + # DocFormat + { + 'doctype': 'DocFormat' + }, + # DocField { 'doctype': 'DocField', diff --git a/erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt b/erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt index 97f57a9f89..849db97685 100644 --- a/erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt +++ b/erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-08-18 16:29:14', + 'creation': '2011-08-23 16:49:40', 'docstatus': 0, - 'modified': '2011-08-23 13:24:12', + 'modified': '2011-10-19 14:12:11', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -13,7 +13,7 @@ # These values are common for all Print Format { 'doctype': 'Print Format', - 'html': "\n\n\n\n\n\n\n\n\n\n", + 'html': "\n\n\n\n\n\n\n\n\n\n", 'module': 'Stock', 'name': '__common__', 'standard': 'Yes' diff --git a/erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt b/erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt index fc7bc0e301..8ffb83e5d3 100644 --- a/erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt +++ b/erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2009-09-07 11:03:11', + 'modified': '2011-10-19 14:18:26', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -13,7 +13,7 @@ # These values are common for all Print Format { 'doctype': 'Print Format', - 'html': '\n\n\n\n\n\n
\n\n
\n
\n

Purchase Receipt:
\n
Date:
\n
\n\n
\n
\n

\n
\n\n
\n
\n \n\n
\n\n\n
\n\n \n \n
\n
\n
\n

Payment Terms
\n

\n

For NCSCI
\n


(Authorised Signatory)
\n
\n', + 'html': '\n\n\n\n\n\n
\n\n
\n
\n

Purchase Receipt:
\n
Date:
\n
\n\n
\n
\n

\n
\n\n
\n
\n \n\n
\n\n\n
\n\n \n \n
\n
\n
\n

Payment Terms
\n

\n

For NCSCI
\n


(Authorised Signatory)
\n
\n', 'module': 'Stock', 'name': '__common__', 'standard': 'Yes'