nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi
2012-08-22 14:59:14 +05:30
parent 25dd92dbdb 688b712bda
commit 297f37da03
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/gl_control/gl_control.py
View File

@@ -622,7 +622,7 @@ def send_notification(new_rv):
<td width = "50%%">Invoice Date : %s<br>Invoice Period : %s to %s <br>Due Date : %s</td> <td width = "50%%">Invoice Date : %s<br>Invoice Period : %s to %s <br>Due Date : %s</td>
</tr> </tr>
</table> </table>
''' % (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.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")) getdate(new_rv.doc.due_date).strftime("%d-%m-%Y"))

4
erpnext/support/doctype/communication/communication.js
View File

@@ -64,7 +64,7 @@ cur_frm.cscript.render_communication_list = function(doc, dt, dn) {
ListView, function(doctype) { ListView, function(doctype) {
var new_doc = LocalDB.create(doctype); var new_doc = LocalDB.create(doctype);
new_doc = locals[doctype][new_doc]; 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); 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({ var RecordListView = wn.views.RecordListView.extend({
default_docstatus: ['0', '1', '2'], default_docstatus: ['0', '1', '2'],
default_filters: [ default_filters: [
[doctype, doc.doctype.toLowerCase(), '=', doc.name], [doctype, doc.doctype.toLowerCase().replace(" ", "_"), '=', doc.name],
], ],
}); });