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

[translations] fixes #4532

Browse Source
This commit is contained in:
Rushabh Mehta
2016-01-04 15:48:37 +05:30
parent aee8b5bcad
commit eb961370ff
12 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@@ -14,7 +14,12 @@ frappe.query_reports["Budget Variance Report"] = {
fieldname: "period", fieldname: "period",
label: __("Period"), label: __("Period"),
fieldtype: "Select", fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly" default: "Monthly"
}, },
{ {

4
erpnext/buying/doctype/supplier/supplier.js
View File

@@ -25,7 +25,7 @@ cur_frm.cscript.make_dashboard = function(doc) {
if(doc.__islocal) if(doc.__islocal)
return; return;
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager"))
cur_frm.dashboard.set_headline('<span class="text-muted">Loading...</span>') cur_frm.dashboard.set_headline('<span class="text-muted">' + __('Loading') + '</span>')
cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier"); cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier");
cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier"); cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier");
@@ -41,7 +41,7 @@ cur_frm.cscript.make_dashboard = function(doc) {
callback: function(r) { callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) { if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
cur_frm.dashboard.set_headline( cur_frm.dashboard.set_headline(
__("Total Billing This Year: ") + "<b>" __("Total billing this year") + ": <b>"
+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency) + format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
+ '</b> / <span class="text-muted">' + __("Total Unpaid") + ": <b>" + '</b> / <span class="text-muted">' + __("Total Unpaid") + ": <b>"
+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency) + format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)

6
erpnext/config/desktop.py
View File

@@ -32,7 +32,8 @@ def get_data():
"icon": "icon-th", "icon": "icon-th",
"icon": "octicon octicon-credit-card", "icon": "octicon octicon-credit-card",
"type": "page", "type": "page",
"link": "pos" "link": "pos",
"label": _("POS")
}, },
"Projects": { "Projects": {
"color": "#8e44ad", "color": "#8e44ad",
@@ -68,6 +69,7 @@ def get_data():
"force_show": True, "force_show": True,
"icon": "octicon octicon-device-camera-video", "icon": "octicon octicon-device-camera-video",
"type": "module", "type": "module",
"is_help": True "is_help": True,
"label": _("Learn")
} }
} }

2
erpnext/public/js/controllers/transaction.js
View File

@@ -489,7 +489,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(docfield) { if(docfield) {
var label = __(docfield.label || "").replace(/\([^\)]*\)/g, ""); var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
field_label_map[grid_doctype + "-" + fname] = field_label_map[grid_doctype + "-" + fname] =
label.trim() + " (" + currency + ")"; label.trim() + " (" + __(currency) + ")";
} }
}); });
} }

7
erpnext/public/js/financial_statements.js
View File

@@ -22,7 +22,12 @@ erpnext.financial_statements = {
"fieldname": "periodicity", "fieldname": "periodicity",
"label": __("Periodicity"), "label": __("Periodicity"),
"fieldtype": "Select", "fieldtype": "Select",
"options": "Yearly\nHalf-yearly\nQuarterly\nMonthly", "options": [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
"default": "Yearly", "default": "Yearly",
"reqd": 1 "reqd": 1
} }

10
erpnext/public/js/stock_analytics.js
View File

@@ -51,7 +51,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
}, },
filters: [ filters: [
{fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty", {fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty",
options:["Value", "Quantity"], options:[{label:__("Value"), value:"Value"}, {label:__("Quantity"), value:"Quantity"}],
filter: function(val, item, opts, me) { filter: function(val, item, opts, me) {
return me.apply_zero_filter(val, item, opts, me); return me.apply_zero_filter(val, item, opts, me);
}}, }},
@@ -64,7 +64,13 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
{fieldtype:"Date", label: __("From Date"), fieldname: "from_date"}, {fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
{fieldtype:"Date", label: __("To Date"), fieldname: "to_date"}, {fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
{fieldtype:"Select", label: __("Range"), fieldname: "range", {fieldtype:"Select", label: __("Range"), fieldname: "range",
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]} options:[
{label:__("Daily"), value:"Daily"},
{label:__("Weekly"), value:"Weekly"},
{label:__("Monthly"), value:"Monthly"},
{label:__("Quarterly"), value:"Quarterly"},
{label:__("Yearly"), value:"Yearly"},
]}
], ],
setup_filters: function() { setup_filters: function() {
var me = this; var me = this;

2
erpnext/public/js/templates/address_list.html
View File

@@ -1,4 +1,4 @@
<p><button class="btn btn-xs btn-default btn-address">New Address</button></p> <p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
<div class="clearfix"></div> <div class="clearfix"></div>
{% for(var i=0, l=addr_list.length; i<l; i++) { %} {% for(var i=0, l=addr_list.length; i<l; i++) { %}
<p class="h6"> <p class="h6">

2
erpnext/public/js/templates/contact_list.html
View File

@@ -1,5 +1,5 @@
<p><button class="btn btn-xs btn-default btn-contact"> <p><button class="btn btn-xs btn-default btn-contact">
New Contact</button></p> {{ __("New Contact") }}</button></p>
<div class="clearfix"></div> <div class="clearfix"></div>
{% for(var i=0, l=contact_list.length; i<l; i++) { %} {% for(var i=0, l=contact_list.length; i<l; i++) { %}

2
erpnext/selling/doctype/customer/customer.js
View File

@@ -66,7 +66,7 @@ cur_frm.cscript.setup_dashboard = function(doc) {
callback: function(r) { callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) { if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
cur_frm.dashboard.set_headline( cur_frm.dashboard.set_headline(
__("Total Billing This Year: ") + "<b>" __("Total billing this year") + ": <b>"
+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency) + format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>" + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency) + format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)

7
erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
View File

@@ -14,7 +14,12 @@ frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = {
fieldname: "period", fieldname: "period",
label: __("Period"), label: __("Period"),
fieldtype: "Select", fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly" default: "Monthly"
}, },
{ {

7
erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
View File

@@ -14,7 +14,12 @@ frappe.query_reports["Territory Target Variance Item Group-Wise"] = {
fieldname: "period", fieldname: "period",
label: __("Period"), label: __("Period"),
fieldtype: "Select", fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly" default: "Monthly"
}, },
{ {

2
erpnext/stock/get_item_details.py
View File

@@ -246,7 +246,7 @@ def insert_item_price(args):
"price_list_rate": price_list_rate "price_list_rate": price_list_rate
}) })
item_price.insert() item_price.insert()
frappe.msgprint("Item Price added for {0} in Price List {1}".format(args.item_code, frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
args.price_list)) args.price_list))
def get_price_list_rate_for(args, item_code): def get_price_list_rate_for(args, item_code):