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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-12-19 12:18:15 +05:30
parent 1a6a94b760 bb852e45e9
commit 4ecc785aab
28 changed files with 393 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/kb_common.js
View File

@@ -33,7 +33,7 @@ KBItemToolbar = function(args, kb) {
this.make_timestamp = function() {
this.line1.innerHTML = repl('By %(name)s | %(when)s', {
name: wn.utils.full_name(this.det.first_name, this.det.last_name),
name: wn.user_info(this.det.owner).fullname,
when: wn.datetime.comment_when(this.det.modified)
});