Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
This commit is contained in:
commit
43d64c6116
@ -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
|
||||
}
|
||||
]
|
||||
]
|
||||
|
@ -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
|
||||
}
|
||||
]
|
||||
]
|
||||
|
@ -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
|
||||
}
|
||||
]
|
||||
]
|
||||
|
@ -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>'
|
||||
|
@ -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
|
||||
}
|
||||
]
|
||||
]
|
||||
|
Loading…
x
Reference in New Issue
Block a user