From fd3f24f4beb55185a5ef4c5e88cc6d127f988111 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 Aug 2012 11:43:55 +0530 Subject: [PATCH 1/2] customer name should come in recurring invoice print format instead of customer id --- erpnext/accounts/doctype/gl_control/gl_control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/gl_control/gl_control.py b/erpnext/accounts/doctype/gl_control/gl_control.py index 5853132edc2..28bc909cdff 100644 --- a/erpnext/accounts/doctype/gl_control/gl_control.py +++ b/erpnext/accounts/doctype/gl_control/gl_control.py @@ -620,7 +620,7 @@ def send_notification(new_rv): Invoice Date : %s
Invoice Period : %s to %s
Due Date : %s - ''' % (com, new_rv.doc.name, new_rv.doc.customer, new_rv.doc.address_display, getdate(new_rv.doc.posting_date).strftime("%d-%m-%Y"), \ + ''' % (com, new_rv.doc.name, new_rv.doc.customer_name, new_rv.doc.address_display, getdate(new_rv.doc.posting_date).strftime("%d-%m-%Y"), \ getdate(new_rv.doc.invoice_period_from_date).strftime("%d-%m-%Y"), getdate(new_rv.doc.invoice_period_to_date).strftime("%d-%m-%Y"),\ getdate(new_rv.doc.due_date).strftime("%d-%m-%Y")) From 73c6542e6c592ab28f3c6b0b9a9b08269445628a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 22 Aug 2012 14:57:35 +0530 Subject: [PATCH 2/2] minor fix in communication.js --- erpnext/support/doctype/communication/communication.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/support/doctype/communication/communication.js b/erpnext/support/doctype/communication/communication.js index d6af5920483..59e2ee9c55b 100644 --- a/erpnext/support/doctype/communication/communication.js +++ b/erpnext/support/doctype/communication/communication.js @@ -64,7 +64,7 @@ cur_frm.cscript.render_communication_list = function(doc, dt, dn) { ListView, function(doctype) { var new_doc = LocalDB.create(doctype); new_doc = locals[doctype][new_doc]; - new_doc[doc.doctype.toLowerCase()] = doc.name; + new_doc[doc.doctype.toLowerCase().replace(" ", "_")] = doc.name; loaddoc(new_doc.doctype, new_doc.name); }); } @@ -79,7 +79,7 @@ cur_frm.cscript.render_list = function(doc, doctype, wrapper, ListView, make_new var RecordListView = wn.views.RecordListView.extend({ default_docstatus: ['0', '1', '2'], default_filters: [ - [doctype, doc.doctype.toLowerCase(), '=', doc.name], + [doctype, doc.doctype.toLowerCase().replace(" ", "_"), '=', doc.name], ], });