From c819fd4ee8981f438470b6b91026e08cac41c709 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 10 Dec 2015 10:34:32 +0530 Subject: [PATCH] [translations] for #4461 --- .../manufacturing_settings.json | 33 +++++++++++++++++-- .../doctype/activity_type/activity_type.js | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json index 61ce9e85b7..5465705d92 100644 --- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json @@ -19,10 +19,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Capacity Planning", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -34,7 +36,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "description": "Disables creation of time logs against Production Orders.\nOperations shall not be tracked against Production Order", + "description": "Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order", "fieldname": "disable_capacity_planning", "fieldtype": "Check", "hidden": 0, @@ -42,10 +44,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Disable Capacity Planning and Time Tracking", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -65,10 +69,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Allow Overtime", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -88,11 +94,13 @@ "in_filter": 0, "in_list_view": 1, "label": "Allow Production on Holidays", + "length": 0, "no_copy": 0, "options": "", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -110,10 +118,12 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -134,10 +144,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Capacity Planning For (Days)", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -157,10 +169,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Time Between Operations (in mins)", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -178,10 +192,12 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -200,10 +216,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Over Production Allowance Percentage", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -223,11 +241,13 @@ "in_filter": 0, "in_list_view": 0, "label": "Backflush Raw Materials Based On", + "length": 0, "no_copy": 0, "options": "BOM\nMaterial Transferred for Manufacture", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -245,10 +265,12 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -267,11 +289,13 @@ "in_filter": 0, "in_list_view": 0, "label": "Default Work In Progress Warehouse", + "length": 0, "no_copy": 0, "options": "Warehouse", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -290,11 +314,13 @@ "in_filter": 0, "in_list_view": 0, "label": "Default Finished Goods Warehouse", + "length": 0, "no_copy": 0, "options": "Warehouse", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -306,12 +332,15 @@ "hide_heading": 0, "hide_toolbar": 0, "icon": "icon-wrench", + "idx": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-08-21 08:27:03.794133", + "max_attachments": 0, + "menu_index": 0, + "modified": "2015-12-10 00:03:20.895790", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing Settings", diff --git a/erpnext/projects/doctype/activity_type/activity_type.js b/erpnext/projects/doctype/activity_type/activity_type.js index f7bb9a5222..7eb3571af1 100644 --- a/erpnext/projects/doctype/activity_type/activity_type.js +++ b/erpnext/projects/doctype/activity_type/activity_type.js @@ -1,6 +1,6 @@ frappe.ui.form.on("Activity Type", { refresh: function(frm) { - frm.add_custom_button("Activity Cost per Employee", function() { + frm.add_custom_button(__("Activity Cost per Employee"), function() { frappe.route_options = {"activity_type": frm.doc.name}; frappe.set_route("List", "Activity Cost"); });