Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-28 15:17:59 +02:00
commit 43d64c6116
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
View File

@ -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
}
]
]

4
erpnext/selling/doctype/quotation/quotation.txt
View File

@ -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
}
]
]

4
erpnext/selling/doctype/sales_order/sales_order.txt
View File

@ -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
}
]
]

6
erpnext/setup/doctype/other_charges/other_charges.js
View File

@ -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 +='</table></td></tr>';
out += '<tr><td colspan = "2">';
out += '<table><tr><td style="width:25%;"><b>In Words</b></td>'

4
erpnext/stock/doctype/delivery_note/delivery_note.txt
View File

@ -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
}
]
]