mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-07 07:20:26 +00:00
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
This commit is contained in:
@@ -6,7 +6,7 @@ wn.provide("erpnext.support");
|
||||
erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
|
||||
refresh: function() {
|
||||
if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
|
||||
cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
|
||||
cur_frm.add_custom_button(wn._('Make Maintenance Visit'), this.make_maintenance_visit)
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){
|
||||
return get_server_fields('get_no_of_visits',docstring(arg),'item_maintenance_detail',doc, cdt, cdn, 1);
|
||||
}
|
||||
else{
|
||||
msgprint("Please enter Start Date and End Date");
|
||||
msgprint(wn._("Please enter Start Date and End Date"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
|
||||
}
|
||||
);
|
||||
} else {
|
||||
alert("Please save the document before generating maintenance schedule");
|
||||
alert(wn._("Please save the document before generating maintenance schedule"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ cur_frm.cscript.refresh = function(doc) {
|
||||
erpnext.hide_naming_series();
|
||||
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
|
||||
&& inList(wn.boot.profile.can_write, doc.doctype)) {
|
||||
cur_frm.add_custom_button('Send', function() {
|
||||
cur_frm.add_custom_button(wn._('Send'), function() {
|
||||
return $c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
|
||||
cur_frm.refresh();
|
||||
});
|
||||
|
||||
@@ -23,8 +23,8 @@ $.extend(cur_frm.cscript, new erpnext.support.SupportTicket({frm: cur_frm}));
|
||||
$.extend(cur_frm.cscript, {
|
||||
onload: function(doc, dt, dn) {
|
||||
if(in_list(user_roles,'System Manager')) {
|
||||
cur_frm.footer.help_area.innerHTML = '<p><a href="#Form/Email Settings/Email Settings">Email Settings</a><br>\
|
||||
<span class="help">Integrate incoming support emails to Support Ticket</span></p>';
|
||||
cur_frm.footer.help_area.innerHTML = '<p><a href="#Form/Email Settings/Email Settings">'+wn._("Email Settings")+'</a><br>\
|
||||
<span class="help">'+wn._("Integrate incoming support emails to Support Ticket")+'</span></p>';
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
wn.pages['support-analytics'].onload = function(wrapper) {
|
||||
wn.ui.make_app_page({
|
||||
parent: wrapper,
|
||||
title: 'Support Analytics',
|
||||
title: wn._('Support Analytics'),
|
||||
single_column: true
|
||||
});
|
||||
|
||||
@@ -18,7 +18,7 @@ wn.pages['support-analytics'].onload = function(wrapper) {
|
||||
erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({
|
||||
init: function(wrapper) {
|
||||
this._super({
|
||||
title: "Support Analtyics",
|
||||
title: wn._("Support Analtyics"),
|
||||
page: wrapper,
|
||||
parent: $(wrapper).find('.layout-main'),
|
||||
appframe: wrapper.appframe,
|
||||
@@ -27,22 +27,22 @@ erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({
|
||||
},
|
||||
|
||||
filters: [
|
||||
{fieldtype:"Select", label: "Fiscal Year", link:"Fiscal Year",
|
||||
{fieldtype:"Select", label: wn._("Fiscal Year"), link:"Fiscal Year",
|
||||
default_value: "Select Fiscal Year..."},
|
||||
{fieldtype:"Date", label: "From Date"},
|
||||
{fieldtype:"Label", label: "To"},
|
||||
{fieldtype:"Date", label: "To Date"},
|
||||
{fieldtype:"Select", label: "Range",
|
||||
{fieldtype:"Date", label: wn._("From Date")},
|
||||
{fieldtype:"Label", label: wn._("To")},
|
||||
{fieldtype:"Date", label: wn._("To Date")},
|
||||
{fieldtype:"Select", label: wn._("Range"),
|
||||
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]},
|
||||
{fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"},
|
||||
{fieldtype:"Button", label: "Reset Filters"}
|
||||
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"},
|
||||
{fieldtype:"Button", label: wn._("Reset Filters")}
|
||||
],
|
||||
|
||||
setup_columns: function() {
|
||||
var std_columns = [
|
||||
{id: "check", name: "Plot", field: "check", width: 30,
|
||||
{id: "check", name: wn._("Plot"), field: "check", width: 30,
|
||||
formatter: this.check_formatter},
|
||||
{id: "status", name: "Status", field: "status", width: 100},
|
||||
{id: "status", name: wn._("Status"), field: "status", width: 100},
|
||||
];
|
||||
this.make_date_range_columns();
|
||||
this.columns = std_columns.concat(this.columns);
|
||||
|
||||
Reference in New Issue
Block a user