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

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

Browse Source
This commit is contained in:
Nabin Hait
2013-10-24 11:40:32 +05:30
parent 3eb901f47d 8833c52c02
commit ca8ad210d2
112 changed files with 677 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stock/doctype/warehouse/warehouse.js
View File

@@ -7,11 +7,11 @@ cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.merge = function(doc, cdt, cdn) {
if (!doc.merge_with) {
msgprint("Please enter the warehouse to which you want to merge?");
msgprint(wn._("Please enter the warehouse to which you want to merge?"));
return;
}
var check = confirm("Are you sure you want to merge this warehouse into "
+ doc.merge_with + "?");
var check = confirm(wn._("Are you sure you want to merge this warehouse into "
+ doc.merge_with + "?"));
if (check) {
return $c_obj(make_doclist(cdt, cdn), 'merge_warehouses', '', '');
}