From 779a365420fa0094fe8711c2f8196e7da8b29146 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 28 Mar 2012 18:31:26 +0530 Subject: [PATCH] fix in print hide of amount in words --- .../doctype/receivable_voucher/receivable_voucher.txt | 4 ++-- erpnext/selling/doctype/quotation/quotation.txt | 4 ++-- erpnext/selling/doctype/sales_order/sales_order.txt | 4 ++-- erpnext/setup/doctype/other_charges/other_charges.js | 6 +++++- erpnext/stock/doctype/delivery_note/delivery_note.txt | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt index 546d99781d..9d84f21d64 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt @@ -935,7 +935,7 @@ 'oldfieldname': u'in_words_export', 'oldfieldtype': u'Data', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 0 }, # DocField @@ -1518,4 +1518,4 @@ 'permlevel': 0, 'print_hide': 1 } -] \ No newline at end of file +] diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt index c8e3ecb37f..39a7327728 100644 --- a/erpnext/selling/doctype/quotation/quotation.txt +++ b/erpnext/selling/doctype/quotation/quotation.txt @@ -875,7 +875,7 @@ 'oldfieldname': u'in_words_export', 'oldfieldtype': u'Data', 'permlevel': 1, - 'print_hide': 1, + 'print_hide': 0, 'width': u'200px' }, @@ -1199,4 +1199,4 @@ 'permlevel': 0, 'print_hide': 1 } -] \ No newline at end of file +] diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index a82f9704f2..7a11bda9ce 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.txt +++ b/erpnext/selling/doctype/sales_order/sales_order.txt @@ -963,7 +963,7 @@ 'oldfieldname': u'in_words_export', 'oldfieldtype': u'Data', 'permlevel': 1, - 'print_hide': 1, + 'print_hide': 0, 'width': u'200px' }, @@ -1333,4 +1333,4 @@ 'permlevel': 0, 'print_hide': 1 } -] \ No newline at end of file +] diff --git a/erpnext/setup/doctype/other_charges/other_charges.js b/erpnext/setup/doctype/other_charges/other_charges.js index a6f457d8df..85bdb7968a 100644 --- a/erpnext/setup/doctype/other_charges/other_charges.js +++ b/erpnext/setup/doctype/other_charges/other_charges.js @@ -36,6 +36,10 @@ cur_frm.pformat.rounded_total_export = function(doc) { return ''; } +cur_frm.pformat.in_words_export = function(doc) { + return ''; +} + cur_frm.pformat.other_charges= function(doc){ //function to make row of table var make_row = function(title,val,bold){ @@ -89,7 +93,7 @@ cur_frm.pformat.other_charges= function(doc){ out += make_row('Rounded Total',fmt_money(doc.rounded_total_export),1); } - if(doc.in_words_export){ + if(doc.in_words_export && !print_hide_dict['in_words_export']){ out +=''; out += ''; out += '' diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt index 4878c36bad..7bbd7d58e7 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.txt +++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt @@ -869,7 +869,7 @@ 'oldfieldname': u'in_words_export', 'oldfieldtype': u'Data', 'permlevel': 1, - 'print_hide': 1, + 'print_hide': 0, 'width': u'150px' }, @@ -1346,4 +1346,4 @@ 'permlevel': 0, 'print_hide': 1 } -] \ No newline at end of file +]
In Words