mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-02 21:18:27 +00:00
fix in print formats and file rename
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -69,3 +69,12 @@ def replace_file_list_column_entries():
|
|||||||
if file_list and "/" in file_list:
|
if file_list and "/" in file_list:
|
||||||
webnotes.conn.sql("UPDATE `%s` SET file_list='%s' WHERE name='%s'" \
|
webnotes.conn.sql("UPDATE `%s` SET file_list='%s' WHERE name='%s'" \
|
||||||
% (tab, file_list.replace('/', '-'), name))
|
% (tab, file_list.replace('/', '-'), name))
|
||||||
|
|
||||||
|
singles = webnotes.conn.sql("""SELECT doctype, value FROM `tabSingles`
|
||||||
|
WHERE field='file_list'""")
|
||||||
|
for doctype, file_list in singles:
|
||||||
|
if file_list and "/" in file_list:
|
||||||
|
webnotes.conn.sql("""UPDATE `tabSingles` SET value='%s'
|
||||||
|
WHERE doctype='%s' AND field='file_list'"""
|
||||||
|
% (file_list.replace('/', '-'), doctype))
|
||||||
|
|
||||||
|
|||||||
@@ -200,7 +200,7 @@
|
|||||||
<td><table width=100% cellspacing=0><tbody>
|
<td><table width=100% cellspacing=0><tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td width=40%><b>Invoice Date</b></td>
|
<td width=40%><b>Invoice Date</b></td>
|
||||||
<td><script>date.str_to_user(doc.voucher_date)</script></td>
|
<td><script>date.str_to_user(doc.posting_date)</script></td>
|
||||||
<tr>
|
<tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>Due Date</b></td>
|
<td><b>Due Date</b></td>
|
||||||
|
|||||||
@@ -227,7 +227,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td width=40%><b>Invoice Date</b></td>
|
<td width=40%><b>Invoice Date</b></td>
|
||||||
<td><script>date.str_to_user(doc.voucher_date)</script></td>
|
<td><script>date.str_to_user(doc.posting_date)</script></td>
|
||||||
<tr>
|
<tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>Due Date</b></td>
|
<td><b>Due Date</b></td>
|
||||||
|
|||||||
@@ -222,7 +222,7 @@
|
|||||||
<td><table width=100% cellspacing=0><tbody>
|
<td><table width=100% cellspacing=0><tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td width=40%><b>Invoice Date</b></td>
|
<td width=40%><b>Invoice Date</b></td>
|
||||||
<td><script>date.str_to_user(doc.voucher_date)</script></td>
|
<td><script>date.str_to_user(doc.posting_date)</script></td>
|
||||||
<tr>
|
<tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>Due Date</b></td>
|
<td><b>Due Date</b></td>
|
||||||
|
|||||||
@@ -1717,7 +1717,7 @@ f.hide_save=function(){$dh(me.page_layout.footer.save_area);}}
|
|||||||
this.sections[this.cur_section[this.docname]].collapse();this.sections[sec_id].expand();this.cur_section[this.docname]=sec_id;}
|
this.sections[this.cur_section[this.docname]].collapse();this.sections[sec_id].expand();this.cur_section[this.docname]=sec_id;}
|
||||||
_f.Frm.prototype.setup_meta=function(){this.meta=get_local('DocType',this.doctype);this.perm=get_perm(this.doctype);this.setup_print();}
|
_f.Frm.prototype.setup_meta=function(){this.meta=get_local('DocType',this.doctype);this.perm=get_perm(this.doctype);this.setup_print();}
|
||||||
_f.Frm.prototype.setup_sidebar=function(){this.sidebar=new wn.widgets.form.sidebar.Sidebar(this);}
|
_f.Frm.prototype.setup_sidebar=function(){this.sidebar=new wn.widgets.form.sidebar.Sidebar(this);}
|
||||||
_f.Frm.prototype.setup_footer=function(){var me=this;var f=this.page_layout.footer;f.save_area=$a(this.page_layout.footer,'div','',{display:'none'});f.help_area=$a(this.page_layout.footer,'div');var b=$btn(f.save_area,'Save',function(){cur_frm.save('Save');},{marginLeft:'0px'},'green');f.show_save=function(){$ds(me.page_layout.footer.save_area);}
|
_f.Frm.prototype.setup_footer=function(){var me=this;var f=this.page_layout.footer;f.save_area=$a(this.page_layout.footer,'div','',{display:'none'});f.help_area=$a(this.page_layout.footer,'div');var b=$btn(f.save_area,'Save',function(){cur_frm.save('Save');},{marginLeft:'0px'},'green');f.show_save=function(){$ds(me.page_layout.footer.save_area);}
|
||||||
f.hide_save=function(){$dh(me.page_layout.footer.save_area);}}
|
f.hide_save=function(){$dh(me.page_layout.footer.save_area);}}
|
||||||
_f.Frm.prototype.setup_fields_std=function(){var fl=fields_list[this.doctype];fl.sort(function(a,b){return a.idx-b.idx});if(fl[0]&&fl[0].fieldtype!="Section Break"||get_url_arg('embed')){this.layout.addrow();if(fl[0].fieldtype!="Column Break"){var c=this.layout.addcell();$y(c.wrapper,{padding:'8px'});}}
|
_f.Frm.prototype.setup_fields_std=function(){var fl=fields_list[this.doctype];fl.sort(function(a,b){return a.idx-b.idx});if(fl[0]&&fl[0].fieldtype!="Section Break"||get_url_arg('embed')){this.layout.addrow();if(fl[0].fieldtype!="Column Break"){var c=this.layout.addcell();$y(c.wrapper,{padding:'8px'});}}
|
||||||
var sec;for(var i=0;i<fl.length;i++){var f=fl[i];if(get_url_arg('embed')&&(in_list(['Section Break','Column Break'],f.fieldtype)))continue;if(f.fieldtype=='Section Break'&&fl[i+1]&&fl[i+1].fieldtype=='Section Break')continue;var fn=f.fieldname?f.fieldname:f.label;var fld=make_field(f,this.doctype,this.layout.cur_cell,this);this.fields[this.fields.length]=fld;this.fields_dict[fn]=fld;if(this.meta.section_style!='Simple')
|
var sec;for(var i=0;i<fl.length;i++){var f=fl[i];if(get_url_arg('embed')&&(in_list(['Section Break','Column Break'],f.fieldtype)))continue;if(f.fieldtype=='Section Break'&&fl[i+1]&&fl[i+1].fieldtype=='Section Break')continue;var fn=f.fieldname?f.fieldname:f.label;var fld=make_field(f,this.doctype,this.layout.cur_cell,this);this.fields[this.fields.length]=fld;this.fields_dict[fn]=fld;if(this.meta.section_style!='Simple')
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
781
|
784
|
||||||
Reference in New Issue
Block a user